put some missing strings in the properties file

Author: codeanticode

mode/languages/mode.properties

@@ -71,7 +71,7 @@ android_editor.error.cannot_create_sketch_properties = Error While creating sket
 android_keystore.warn.cannot_create_folders.title = Folders, folders, folders
 android_keystore.warn.cannot_create_folders.body = Could not create the necessary folders to build.\nPerhaps you have some file permissions to sort out?
 android_keystore.warn.cannot_find_keystore.title = Well, this is unexpected...
-android_keystore.warn.cannot_find_keystore.body = The keystore was succesfully cretated but cannot be found.\nPerhaps was it deleted accidentally?
+android_keystore.warn.cannot_find_keystore.body = The keystore was succesfully created but cannot be found.\nPerhaps was it deleted accidentally?
 android_keystore.error.cannot_create_keystore = The keystore could not be created, due to the following error:
 
 # ---------------------------------------
@@ -99,7 +99,7 @@ android_mode.status.building_project = Building Android project...
 android_mode.status.project_build_failed = Build failed.
 
 # ---------------------------------------
-# Android Preprocesor
+# Android Preprocessor
 
 android_preprocessor.error.cannot_parse_size = More about the size() command on Android can be\nfound here: http://wiki.processing.org/w/Android 
 android_preprocessor.error.cannot_parse_size_exception = Could not parse the size() command. 
@@ -190,9 +190,27 @@ android_avd.error.cannot_load_avd_title = Could not load the AVD
 android_avd.error.cannot_load_avd_body = This could mean that the Android tools need to be updated,<br>or that the Processing AVD should be deleted (it will<br>automatically re-created the next time you run Processing).<br><br>You can use the avdmanager command line tool to create AVDs manually and list the current AVDs.
 
 
-android_avd.error.sdk_wrong_install_title = The SDK is not properly instaled
+android_avd.error.sdk_wrong_install_title = The SDK is not properly installed
 android_avd.error.sdk_wrong_install_body = Please re-read the installation instructions for Processing<br>found in <a href=\"%s\">this online tutorial</a>.
 
+# ---------------------------------------
+# Devices
+
+android_devices.error.cannot_get_device_list = Received unfamiliar output from \u201Cadb devices\u201D.\nThe device list may have errors.
+    
+android_devices.error.no_permissions_title = Found devices with no permissions!    
+
+android_devices.error.no_permissions_body = Make sure that the device has USB debugging enabled, and that the required USB drivers are installed on Windows, and that permissions are properly configured on Linux. Also, on Linux, don't set the USB configuration to \"charging\" while debugging.<br><br> Read this guide on <a href=\"%s\">running apps on hardware device</a> for more details.
+  
+  private static final String DEVICE_PERMISSIONS_URL = 
+	"https://developer.android.com/studio/run/device.html";
+	  
+  private static final String DEVICE_PERMISSIONS_TITLE =
+	"";
+	  
+  private static final String DEVICE_PERMISSIONS_MESSAGE =
+    
+
 
 # ---------------------------------------
 # Keystore manager

mode/src/processing/mode/android/AndroidEditor.java

@@ -23,7 +23,6 @@
 package processing.mode.android;
 
 import processing.app.Base;
-import processing.app.Language;
 import processing.app.Mode;
 import processing.app.Platform;
 import processing.app.Settings;

mode/src/processing/mode/android/AndroidRunner.java

@@ -24,7 +24,6 @@
 
 import java.io.IOException;
 import java.io.PrintStream;
-import java.security.PublicKey;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -49,10 +48,6 @@
 public class AndroidRunner implements DeviceListener {
   private static final String DEFAULT_PACKAGE_NAME = "processing.android";
 
-  private static final String CANCEL_WAITING_FOR_DEVICE = "No, on second thought, I'm giving up on waiting for that device to show up.";  
-  private static final String CANNOT_PARSE_LINE = "Can't parse this exception line:";
-  private static final String UNKNOWN_EXCEPTION = "Unknown exception";
-  
   AndroidBuild build;
   RunnerListener listener;
 
@@ -168,7 +163,8 @@ public VirtualMachine connectVirtualMachine(int port) throws IOException {
   private AttachingConnector getConnector() {
     // Eclipse gives an error in the following line (org.eclipse cannot be resolved), but just ignore it.
     // The mode runs and compiles fine.
-    VirtualMachineManager vmManager = org.eclipse.jdi.Bootstrap.virtualMachineManager();
+//    VirtualMachineManager vmManager = org.eclipse.jdi.Bootstrap.virtualMachineManager();
+    VirtualMachineManager vmManager = com.sun.jdi.Bootstrap.virtualMachineManager();
     for (Connector connector : vmManager.attachingConnectors()) {
       if ("com.sun.jdi.SocketAttach".equals(connector.name())) {
         return (AttachingConnector) connector;

mode/src/processing/mode/android/AndroidSDK.java

@@ -86,12 +86,6 @@ class AndroidSDK {
   private static final String SDK_LICENSE_URL = 
       "https://developer.android.com/studio/terms.html";
 
-  private static final String REMOVING_KEYSTORE_FILE = "Removing expired debug.keystore file.";
-  private static final String CANNOT_REMOVE_KEYSTORE_FILE = "Could not remove the expired debug.keystore file.";
-  private static final String REMOVE_FILE_PROMPT = "Please remove the file ";
-  private static final String INVALID_DATE = "The date '";
-  private static final String REPORT_BUG_PROMPT = "Please report this as a bug so we can fix it.";
-  
   private static final int NO_ERROR     = 0;
   private static final int SKIP_ENV_SDK = 1;
   private static final int MISSING_SDK  = 2;

mode/src/processing/mode/android/Commander.java

@@ -55,9 +55,7 @@ public class Commander implements RunnerListener {
   static final String targetArg_FRAGMENT = "fragment";
   static final String targetArg_WALLPAPER = "wallpaper";
   static final String targetArg_WATCHFACE = "watchface";
-  static final String targetArg_VR = "vr";
-  static final String targetArg_CARDBOARD = "cardboard";
-  static final String targetArg_DAYDREAM = "daydream";  
+  static final String targetArg_VR = "vr";  
   static final String targetArg_AR = "ar";
   static final String sketchArg = "--sketch=";
   static final String forceArg = "--force";
@@ -136,10 +134,8 @@ private void parseArgs(String[] args) {
           appComponent = AndroidBuild.WALLPAPER;
         } else if (compStr.equals(targetArg_WATCHFACE)) {
           appComponent = AndroidBuild.WATCHFACE;
-        } else if (compStr.equals(targetArg_VR) || compStr.equals(targetArg_CARDBOARD)) {
-          appComponent = AndroidBuild.VR_CARDBOARD;
-        } else if (compStr.equals(targetArg_DAYDREAM)) {
-          appComponent = AndroidBuild.VR_DAYDREAM;
+        } else if (compStr.equals(targetArg_VR)) {
+          appComponent = AndroidBuild.VR;
         } else if (compStr.equals(targetArg_AR)) {
           appComponent = AndroidBuild.AR;
         }

mode/src/processing/mode/android/Devices.java

@@ -41,23 +41,9 @@
  *
  */
 class Devices {
-  private static final String ADB_DEVICES_ERROR =
-    "Received unfamiliar output from “adb devices”.\n" +
-    "The device list may have errors.";
-  
   private static final String DEVICE_PERMISSIONS_URL = 
 	"https://developer.android.com/studio/run/device.html";
 
-  private static final String DEVICE_PERMISSIONS_TITLE =
-	"Found devices with no permissions!";
-	  
-  private static final String DEVICE_PERMISSIONS_MESSAGE =
-    "Make sure that the device has USB debugging enabled, and that the required " + 
-    "USB drivers are installed on Windows, and that permissions are properly configured on Linux. " + 
-    "Also, on Linux, don't set the USB configuration to \"charging\" while debugging.<br><br>" +
-	  "Read this guide on <a href=\"" + DEVICE_PERMISSIONS_URL + "\">runnings apps on hardware device</a> " +
-	  "for more details.";
-
   private static final Devices INSTANCE = new Devices();
 
   private static final String BT_DEBUG_PORT = "4444";
@@ -389,8 +375,8 @@ public List<String> list() {
     // might read "List of devices attached"
     final String stdout = result.getStdout();
     if (!(stdout.contains("List of devices") || stdout.trim().length() == 0)) {
-      System.err.println(ADB_DEVICES_ERROR);
-      System.err.println("Output was “" + stdout + "”");
+      System.err.println(AndroidMode.getTextString("android_devices.error.cannot_get_device_list"));
+      System.err.println(stdout);
       return Collections.emptyList();
     }
 
@@ -402,7 +388,8 @@ public List<String> list() {
         if (fields[1].equals("device")) {
           devices.add(fields[0]);
         } else if (fields[1].contains("no permissions") && showPermissionsErrorMessage) {
-          AndroidUtil.showMessage(DEVICE_PERMISSIONS_TITLE, DEVICE_PERMISSIONS_MESSAGE);     	
+          AndroidUtil.showMessage(AndroidMode.getTextString("android_devices.error.no_permissions_title"),
+                                  AndroidMode.getTextString("android_devices.error.no_permissions_body", DEVICE_PERMISSIONS_URL));
           showPermissionsErrorMessage = false;
         }
       }