diff --git a/Gruntfile.js b/Gruntfile.js
index 8db1f3422..e198805fc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -120,9 +120,11 @@ module.exports = function (grunt) {
         deviceMount: '/sdcard/opendatakit',
         // The mount point of the device for odk collect forms.
         formMount: '/sdcard/odk/forms',
+        assetsDir: 'app/config/assets',
         // The directory where the 'tables' directory containing the tableId
         // directories lives.
         tablesDir: 'app/config/tables',
+        dataDir: 'app/data',
         // Where the templates for a new tableId folder lives. i.e. if you want
         // to add a table, the contents of this directory would be copied to
         // tablesDir/tableId.
@@ -2066,4 +2068,97 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
         if (set === "off") grunt.option("force", false);
         if (set === "restore") grunt.option("force", previous_force_state);
     });
+
+    function deleteFilesList(grunt, workingDir, toBeDeleted) {
+        toBeDeleted.forEach(function (fileName) {
+            var dirToUse = workingDir;
+            if (!dirToUse.endsWith('/')) {
+                dirToUse = dirToUse + '/';
+            }
+
+            var src = dirToUse + fileName;
+            grunt.log.writeln('deleteTopLevel: deleting ' + src);
+            grunt.file.delete(src, {force: true});
+        });
+    }
+
+    var deleteTopLevel = function(grunt, dirToDelete) {
+        var toBeDeleted = grunt.file.expand(
+            {cwd: dirToDelete },
+            '*');
+        deleteFilesList(grunt, dirToDelete, toBeDeleted);
+    };
+
+    grunt.registerTask(
+        'empty',
+        'Remove unnecessary files to make an empty app-designer',
+        function() {
+
+            deleteTopLevel(grunt, tablesConfig.tablesDir);
+            deleteTopLevel(grunt, tablesConfig.assetsDir + '/csv');
+            deleteTopLevel(grunt, tablesConfig.dataDir);
+            deleteTopLevel(grunt, tablesConfig.appDir + '/' + tablesConfig.outputCsvDir);
+            deleteTopLevel(grunt, tablesConfig.appDir + '/' + tablesConfig.outputDbDir);
+            deleteTopLevel(grunt, tablesConfig.appDir + '/' + tablesConfig.outputDebugDir);
+            deleteTopLevel(grunt, tablesConfig.appDir + '/' + tablesConfig.outputPropsDir);
+
+            var assetFilesToDelete = grunt.file.expand(
+                {filter: 'isFile',
+                    cwd: tablesConfig.assetsDir },
+                '*.*',
+                '!favicon.ico',
+                'css/**',
+                '!css/odk-survey.css',
+                'csv/**',
+                'framework/**',
+                '!**/*.clean.*',
+                '!framework/forms/framework.clean/**',
+                'img/**',
+                '!img/play.png',
+                '!img/form_logo.png',
+                '!img/backup.png',
+                '!img/advance.png',
+                '!img/little_arrow.png',
+                'js/**',
+                '!js/util.js',
+                '!libs/**',
+                '!commonDefinitions.js',
+                '!index.html',
+                '!framework/forms/framework/formDef.json',
+                '!framework/forms/framework/framework.xlsx',
+                '!framework/frameworkDefinitions.js'
+            );
+
+            // Delete unnecessary files
+            deleteFilesList(grunt, tablesConfig.assetsDir, assetFilesToDelete);
+
+            // Find all instances of things with .clean in it
+            var cleanFilesToDelete = grunt.file.expand(
+                { cwd: tablesConfig.assetsDir,
+                    filter: 'isFile'},
+                '**/*.clean.*',
+                '**/*.clean/**'
+            );
+
+            // Copy *.clean files over to the correct directory
+            cleanFilesToDelete.forEach(function(fileName) {
+                var src = tablesConfig.assetsDir + '/' + fileName;
+                var dest = src;
+                var dest = dest.replace(new RegExp('.clean', 'g'), '');
+                grunt.log.writeln('copy ' + src + ' to ' + dest);
+                grunt.file.copy(src, dest);
+            });
+
+            // Delete all of the .clean files now
+            deleteFilesList(grunt, tablesConfig.assetsDir, cleanFilesToDelete);
+
+            // Delete all of the other framework directories
+            var assetsDirToDelete = grunt.file.expand(
+                {cwd: tablesConfig.assetsDir + '/framework/forms'},
+                '*',
+                '*.*',
+                '!framework/**');
+
+            deleteFilesList(grunt, tablesConfig.assetsDir + '/framework/forms', assetsDirToDelete);
+        });
 };
diff --git a/app/config/assets/commonDefinitions.clean.js b/app/config/assets/commonDefinitions.clean.js
index 2da079bcc..98b1f21c0 100644
--- a/app/config/assets/commonDefinitions.clean.js
+++ b/app/config/assets/commonDefinitions.clean.js
@@ -9,7 +9,8 @@ window.odkCommonDefinitions = {
           "locale": {
             "text": {
               "en": "English",
-              "hi": "अंग्रेज़ी ",
+              "hi": "अंग्रेज़ी",
+              "es": "Inglés",
               "default": "English"
             }
           }
@@ -23,12 +24,27 @@ window.odkCommonDefinitions = {
             "text": {
               "en": "Hindi",
               "hi": "हिंदी",
+              "es": "Hindi",
               "default": "Hindi"
             }
           }
         },
         "_row_num": 8,
         "name": "hi"
+      },
+      {
+        "display": {
+          "locale": {
+            "text": {
+              "en": "Spanish",
+              "hi": "स्पेनिश",
+              "es": "Español",
+              "default": "Spanish"
+            }
+          }
+        },
+        "_row_num": 9,
+        "name": "es"
       }
     ]
   },
diff --git a/app/config/assets/framework/forms/framework.clean/formDef.json b/app/config/assets/framework/forms/framework.clean/formDef.json
index 727bcb1f6..82fba7c2f 100644
--- a/app/config/assets/framework/forms/framework.clean/formDef.json
+++ b/app/config/assets/framework/forms/framework.clean/formDef.json
@@ -65,6 +65,18 @@
         "_row_num": 10
       }
     ],
+    "choices": [
+      {
+        "choice_list_name": "test_forms",
+        "data_value": "form_id_here",
+        "display": {
+          "title": {
+            "text": "form_title_here"
+          }
+        },
+        "_row_num": 2
+      }
+    ],
     "settings": [
       {
         "setting_name": "table_id",
@@ -90,6 +102,7 @@
             "text": {
               "en": "Common Javascript Framework",
               "hi": "सामान्य जावास्क्रिप्ट फ़्रेमवर्क",
+              "es": "Marco común de Javascript",
               "default": "Common Javascript Framework"
             }
           }
@@ -105,6 +118,7 @@
             "text": {
               "en": "English",
               "hi": "अंग्रेज़ी",
+              "es": "Inglés",
               "default": "English"
             }
           }
@@ -118,6 +132,7 @@
             "text": {
               "en": "Hindi",
               "hi": "हिंदी",
+              "es": "Hindi",
               "default": "Hindi"
             }
           }
@@ -125,55 +140,58 @@
         "_row_num": 8
       },
       {
-        "setting_name": "framework_variant",
-        "_row_num": 9
-      }
-    ],
-    "choices": [
-      {
-        "choice_list_name": "test_forms",
-        "data_value": "form_id_here",
+        "setting_name": "es",
         "display": {
-          "title": {
-            "text": "form_title_here"
+          "locale": {
+            "text": {
+              "en": "Spanish",
+              "hi": "स्पेनिश",
+              "es": "Español",
+              "default": "Spanish"
+            }
           }
         },
-        "_row_num": 2
+        "_row_num": 9
       }
     ],
     "framework_translations": [
       {
         "string_token": "constraint_message",
         "text": {
-          "default": "Constraint violated."
+          "default": "Constraint violated.",
+          "es": "Restricción incumplida"
         },
         "_row_num": 2
       },
       {
         "string_token": "invalid_value_message",
         "text": {
-          "default": "Invalid value."
+          "default": "Invalid value.",
+          "es": "Valor no válido."
         },
         "_row_num": 3
       },
       {
         "string_token": "required_message",
         "text": {
-          "default": "Required value not provided."
+          "default": "Required value not provided.",
+          "es": "Dato requerido no proporcionado"
         },
         "_row_num": 4
       },
       {
         "string_token": "required_exception_message",
         "text": {
-          "default": "Exception while evaluating required() expression. See console log."
+          "default": "Exception while evaluating required() expression. See console log.",
+          "es": "Excepción al evaluar la expresión requerido(). Ver consola de registro"
         },
         "_row_num": 5
       },
       {
         "string_token": "constraint_exception_message",
         "text": {
-          "default": "Exception while evaluating constraint() expression. See console log."
+          "default": "Exception while evaluating constraint() expression. See console log.",
+          "es": "Excepción al evaluar la expresión restricción(). Ver consola de registro"
         },
         "_row_num": 6
       },
@@ -181,7 +199,8 @@
         "string_token": "acknLabel",
         "text": {
           "default": "Acknowledge",
-          "hi": "स्वीकार करना"
+          "hi": "स्वीकार करना",
+          "es": "Admitir"
         },
         "_row_num": 7
       },
@@ -189,7 +208,8 @@
         "string_token": "back_button_label",
         "text": {
           "default": "Back",
-          "hi": "लौटना"
+          "hi": "लौटना",
+          "es": "Atrás"
         },
         "_row_num": 8
       },
@@ -197,7 +217,8 @@
         "string_token": "next_button_label",
         "text": {
           "default": "Next",
-          "hi": "आगामी"
+          "hi": "आगामी",
+          "es": "Siguiente"
         },
         "_row_num": 9
       },
@@ -205,238 +226,272 @@
         "string_token": "continue_button_label",
         "text": {
           "default": "Continue",
-          "hi": "जारी रहना"
+          "hi": "जारी रहना",
+          "es": "Continuar"
         },
         "_row_num": 10
       },
       {
         "string_token": "select_one_dropdown_label",
         "text": {
-          "default": "Choose Option"
+          "default": "Choose Option",
+          "es": "Elige una opción"
         },
         "_row_num": 11
       },
       {
         "string_token": "requiredValueErr",
         "text": {
-          "default": "Required value was not provided."
+          "default": "Required value was not provided.",
+          "es": "Dato requerido no proporcionado"
         },
         "_row_num": 12
       },
       {
         "string_token": "geopoint_button_label",
         "text": {
-          "default": "Record Location"
+          "default": "Record Location",
+          "es": "Grabar ubicación"
         },
         "_row_num": 13
       },
       {
         "string_token": "geopoint_latitude_component",
         "text": {
-          "default": "Latitude: {{value.latitude}}"
+          "default": "Latitude: {{value.latitude}}",
+          "es": "Latitud: {{value.latitude}}"
         },
         "_row_num": 14
       },
       {
         "string_token": "geopoint_longitude_component",
         "text": {
-          "default": "Longitude: {{value.longitude}}"
+          "default": "Longitude: {{value.longitude}}",
+          "es": "Longitud: {{value.longitude}}"
         },
         "_row_num": 15
       },
       {
         "string_token": "geopoint_altitude_component",
         "text": {
-          "default": "Altitude: {{value.altitude}}"
+          "default": "Altitude: {{value.altitude}}",
+          "es": "Altitud: {{value.altitude}}"
         },
         "_row_num": 16
       },
       {
         "string_token": "geopoint_accuracy_component",
         "text": {
-          "default": "Accuracy: {{value.accuracy}}"
+          "default": "Accuracy: {{value.accuracy}}",
+          "es": "Precisión: {{value.accuracy}}"
         },
         "_row_num": 17
       },
       {
         "string_token": "waiting_text",
         "text": {
-          "default": "Please wait…"
+          "default": "Please wait…",
+          "es": "Por favor, espere…"
         },
         "_row_num": 18
       },
       {
         "string_token": "take_video_button_label",
         "text": {
-          "default": "Take Video"
+          "default": "Take Video",
+          "es": "Graba un vídeo"
         },
         "_row_num": 19
       },
       {
         "string_token": "choose_video_button_label",
         "text": {
-          "default": "Choose Video"
+          "default": "Choose Video",
+          "es": "Elige un vídeo"
         },
         "_row_num": 20
       },
       {
         "string_token": "video_control_not_supported",
         "text": {
-          "default": "Video controls are not supported."
+          "default": "Video controls are not supported.",
+          "es": "Controles de vídeo no son compatibles."
         },
         "_row_num": 21
       },
       {
         "string_token": "take_audio_button_label",
         "text": {
-          "default": "Capture Audio"
+          "default": "Capture Audio",
+          "es": "Captura audio"
         },
         "_row_num": 22
       },
       {
         "string_token": "choose_audio_button_label",
         "text": {
-          "default": "Choose Audio"
+          "default": "Choose Audio",
+          "es": "Elige audio"
         },
         "_row_num": 23
       },
       {
         "string_token": "audio_control_not_supported",
         "text": {
-          "default": "Audio controls are not supported."
+          "default": "Audio controls are not supported.",
+          "es": "Controles de audio no son compatibles."
         },
         "_row_num": 24
       },
       {
         "string_token": "confirm_action_no_label",
         "text": {
-          "default": "NO"
+          "default": "NO",
+          "es": "NO"
         },
         "_row_num": 25
       },
       {
         "string_token": "confirm_action_yes_label",
         "text": {
-          "default": "YES"
+          "default": "YES",
+          "es": "SI"
         },
         "_row_num": 26
       },
       {
         "string_token": "external_link_button_label",
         "text": {
-          "default": "Follow link"
+          "default": "Follow link",
+          "es": "Sigue el enlace"
         },
         "_row_num": 27
       },
       {
         "string_token": "survey_form_identification",
         "text": {
-          "default": "<div><center>ODK Survey</center><hr></div><div><p>Form name: {{localizeText form_title}}</p>{{#if form_version}}<p>Form version: {{form_version}}</p>{{/if}}<hr></div>"
+          "default": "<div><center>ODK Survey</center><hr></div><div><p>Form name: {{localizeText form_title}}</p>{{#if form_version}}<p>Form version: {{form_version}}</p>{{/if}}<hr></div>",
+          "es": "<div><center>ODK Survey</center><hr></div><div><p>Nombre del Formulario: {{localizeText form_title}}</p>{{#if form_version}}<p>Version de Formulario: {{form_version}}</p>{{/if}}<hr></div>"
         },
         "_row_num": 28
       },
       {
         "string_token": "finalize_survey_instance_detail",
         "text": {
-          "default": "<p>You are at the end of instance: </p><p>\"{{display_field}}\"</p><hr>"
+          "default": "<p>You are at the end of instance: </p><p>\"{{display_field}}\"</p><hr>",
+          "es": "<p>Está en el final de la instancia: </p><p>\"{{display_field}}\"</p><hr>"
         },
         "_row_num": 29
       },
       {
         "string_token": "finalize_survey_button_label",
         "text": {
-          "default": "Finalize"
+          "default": "Finalize",
+          "es": "Finalizar"
         },
         "_row_num": 30
       },
       {
         "string_token": "save_as_incomplete_survey_button_label",
         "text": {
-          "default": "Incomplete"
+          "default": "Incomplete",
+          "es": "Incompleto"
         },
         "_row_num": 31
       },
       {
         "string_token": "take_image_button_label",
         "text": {
-          "default": "Take Photo"
+          "default": "Take Photo",
+          "es": "Tomé una foto"
         },
         "_row_num": 33
       },
       {
         "string_token": "choose_image_button_label",
         "text": {
-          "default": "Choose Image"
+          "default": "Choose Image",
+          "es": "Elige una imagen"
         },
         "_row_num": 34
       },
       {
         "string_token": "launch_intent_button_label",
         "text": {
-          "default": "Launch Intent"
+          "default": "Launch Intent",
+          "es": "Lanzamiento de intención"
         },
         "_row_num": 35
       },
       {
         "string_token": "opening_survey_instance_detail",
         "text": {
-          "default": "{{#if display_field}}\n        <p>You are at the start of instance: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>You are at the start of a new instance.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>Last saved:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>"
+          "default": "{{#if display_field}}\n        <p>You are at the start of instance: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>You are at the start of a new instance.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>Last saved:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>",
+          "es": "{{#if display_field}}\n        <p>estás en el inicio de la instancia: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>estás en el inicio de una nueva instancia.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>guardado por última vez:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>"
         },
         "_row_num": 36
       },
       {
         "string_token": "opening_survey_next_button_label",
         "text": {
-          "default": "Go to next prompt"
+          "default": "Go to next prompt",
+          "es": "Ir al siguiente"
         },
         "_row_num": 37
       },
       {
         "string_token": "options_popup_language_heading",
         "text": {
-          "default": "Language"
+          "default": "Language",
+          "es": "Idioma"
         },
         "_row_num": 38
       },
       {
         "string_token": "options_popup_contents_heading",
         "text": {
-          "default": "Contents"
+          "default": "Contents",
+          "es": "Contenido"
         },
         "_row_num": 39
       },
       {
         "string_token": "options_popup_ignore_changes_heading",
         "text": {
-          "default": "Ignore Changes + Exit"
+          "default": "Ignore Changes + Exit",
+          "es": "Ignorar cambios y salir"
         },
         "_row_num": 40
       },
       {
         "string_token": "options_popup_save_changes_heading",
         "text": {
-          "default": "Save Changes + Exit"
+          "default": "Save Changes + Exit",
+          "es": "Guardar cambios y salir"
         },
         "_row_num": 41
       },
       {
         "string_token": "options_popup_finalize_changes_heading",
         "text": {
-          "default": "Finalize Changes + Exit"
+          "default": "Finalize Changes + Exit",
+          "es": "Finalizar cambios y salir"
         },
         "_row_num": 42
       },
       {
         "string_token": "screen_popup_ok_button_label",
         "text": {
-          "default": "OK"
+          "default": "OK",
+          "es": "Confirmar"
         },
         "_row_num": 43
       },
       {
         "string_token": "select_with_other_other_label",
         "text": {
-          "default": "Other:"
+          "default": "Other:",
+          "es": "Otro:"
         },
         "_row_num": 44
       },
@@ -444,93 +499,130 @@
         "string_token": "select_deselect_label",
         "text": {
           "default": "Deselect",
-          "hi": "अचयनित"
+          "hi": "अचयनित",
+          "es": "Deseleccioanr"
         },
         "_row_num": 45
       },
       {
         "string_token": "take_signature_button_label",
         "text": {
-          "default": "Get Signature"
+          "default": "Get Signature",
+          "es": "Obtener firma"
         },
         "_row_num": 46
       },
       {
         "string_token": "instances_survey_create_button_label",
         "text": {
-          "default": "Create new instance"
+          "default": "Create new instance",
+          "es": "Crear nueva instancia"
         },
         "_row_num": 47
       },
       {
         "string_token": "instances_no_saved_instances_label",
         "text": {
-          "default": "No saved instances."
+          "default": "No saved instances.",
+          "es": "Instancias no guardadas"
         },
         "_row_num": 48
       },
       {
         "string_token": "instances_last_save_date_label",
         "text": {
-          "default": "<p><strong>Last Save Date:</strong></p>"
+          "default": "<p><strong>Last Save Date:</strong></p>",
+          "es": "<p><strong>Última fecha guardada:</strong></p>"
         },
         "_row_num": 49
       },
       {
         "string_token": "instances_previously_created_instances_label",
         "text": {
-          "default": "<p>Previously created instances:</p>"
+          "default": "<p>Previously created instances:</p>",
+          "es": "<p>Instancias creadas previamente:</p>"
         },
         "_row_num": 50
       },
       {
         "string_token": "savepoint_type_finalized_text_label",
         "text": {
-          "default": "Finalized"
+          "default": "Finalized",
+          "es": "Finalizado"
         },
         "_row_num": 51
       },
       {
         "string_token": "savepoint_type_incomplete_text_label",
         "text": {
-          "default": "Incomplete"
+          "default": "Incomplete",
+          "es": "Incompleto"
         },
         "_row_num": 52
       },
       {
         "string_token": "savepoint_type_checkpoint_text_label",
         "text": {
-          "default": "Checkpoint"
+          "default": "Checkpoint",
+          "es": "Cambios no guardados"
         },
         "_row_num": 53
       },
       {
         "string_token": "linked_table_new_instance_label",
         "text": {
-          "default": "Create new instance"
+          "default": "Create new instance",
+          "es": "Crear nueva instancia"
         },
         "_row_num": 54
       },
       {
         "string_token": "barcode_button_label",
         "text": {
-          "default": "Scan Barcode"
+          "default": "Scan Barcode",
+          "es": "Escanear Código de Barras"
         },
         "_row_num": 55
       },
       {
         "string_token": "invalid_numeric_message",
         "text": {
-          "default": "Numeric value expected"
+          "default": "Numeric value expected",
+          "es": "Valor numérico esperado"
         },
         "_row_num": 56
       },
       {
         "string_token": "invalid_integer_message",
         "text": {
-          "default": "Integer value expected"
+          "default": "Integer value expected",
+          "es": "Valor entero esperado"
         },
         "_row_num": 57
+      },
+      {
+        "string_token": "confirm_exit_label",
+        "text": {
+          "default": "Exit",
+          "es": "Salir"
+        },
+        "_row_num": 58
+      },
+      {
+        "string_token": "confirm_cancel_label",
+        "text": {
+          "default": "Cancel",
+          "es": "Cancelar"
+        },
+        "_row_num": 59
+      },
+      {
+        "string_token": "confirm_message",
+        "text": {
+          "default": "Are you sure you want to exit and lose all changes?",
+          "es": "¿Estás seguro de que quieres salir y perder todos los cambios?"
+        },
+        "_row_num": 60
       }
     ]
   },
@@ -575,6 +667,7 @@
             "text": {
               "en": "Common Javascript Framework",
               "hi": "सामान्य जावास्क्रिप्ट फ़्रेमवर्क",
+              "es": "Marco común de Javascript",
               "default": "Common Javascript Framework"
             }
           }
@@ -590,6 +683,7 @@
             "text": {
               "en": "English",
               "hi": "अंग्रेज़ी",
+              "es": "Inglés",
               "default": "English"
             }
           }
@@ -603,14 +697,25 @@
             "text": {
               "en": "Hindi",
               "hi": "हिंदी",
+              "es": "Hindi",
               "default": "Hindi"
             }
           }
         },
         "_row_num": 8
       },
-      "framework_variant": {
-        "setting_name": "framework_variant",
+      "es": {
+        "setting_name": "es",
+        "display": {
+          "locale": {
+            "text": {
+              "en": "Spanish",
+              "hi": "स्पेनिश",
+              "es": "Español",
+              "default": "Spanish"
+            }
+          }
+        },
         "_row_num": 9
       },
       "_locales": {
@@ -623,6 +728,7 @@
                 "text": {
                   "en": "English",
                   "hi": "अंग्रेज़ी",
+                  "es": "Inglés",
                   "default": "English"
                 }
               }
@@ -636,12 +742,27 @@
                 "text": {
                   "en": "Hindi",
                   "hi": "हिंदी",
+                  "es": "Hindi",
                   "default": "Hindi"
                 }
               }
             },
             "_row_num": 8,
             "name": "hi"
+          },
+          {
+            "display": {
+              "locale": {
+                "text": {
+                  "en": "Spanish",
+                  "hi": "स्पेनिश",
+                  "es": "Español",
+                  "default": "Spanish"
+                }
+              }
+            },
+            "_row_num": 9,
+            "name": "es"
           }
         ]
       },
@@ -657,6 +778,7 @@
             "text": {
               "en": "Common Javascript Framework",
               "hi": "सामान्य जावास्क्रिप्ट फ़्रेमवर्क",
+              "es": "Marco común de Javascript",
               "default": "Common Javascript Framework"
             }
           }
@@ -685,35 +807,40 @@
         "constraint_message": {
           "string_token": "constraint_message",
           "text": {
-            "default": "Constraint violated."
+            "default": "Constraint violated.",
+            "es": "Restricción incumplida"
           },
           "_row_num": 2
         },
         "invalid_value_message": {
           "string_token": "invalid_value_message",
           "text": {
-            "default": "Invalid value."
+            "default": "Invalid value.",
+            "es": "Valor no válido."
           },
           "_row_num": 3
         },
         "required_message": {
           "string_token": "required_message",
           "text": {
-            "default": "Required value not provided."
+            "default": "Required value not provided.",
+            "es": "Dato requerido no proporcionado"
           },
           "_row_num": 4
         },
         "required_exception_message": {
           "string_token": "required_exception_message",
           "text": {
-            "default": "Exception while evaluating required() expression. See console log."
+            "default": "Exception while evaluating required() expression. See console log.",
+            "es": "Excepción al evaluar la expresión requerido(). Ver consola de registro"
           },
           "_row_num": 5
         },
         "constraint_exception_message": {
           "string_token": "constraint_exception_message",
           "text": {
-            "default": "Exception while evaluating constraint() expression. See console log."
+            "default": "Exception while evaluating constraint() expression. See console log.",
+            "es": "Excepción al evaluar la expresión restricción(). Ver consola de registro"
           },
           "_row_num": 6
         },
@@ -721,7 +848,8 @@
           "string_token": "acknLabel",
           "text": {
             "default": "Acknowledge",
-            "hi": "स्वीकार करना"
+            "hi": "स्वीकार करना",
+            "es": "Admitir"
           },
           "_row_num": 7
         },
@@ -729,7 +857,8 @@
           "string_token": "back_button_label",
           "text": {
             "default": "Back",
-            "hi": "लौटना"
+            "hi": "लौटना",
+            "es": "Atrás"
           },
           "_row_num": 8
         },
@@ -737,7 +866,8 @@
           "string_token": "next_button_label",
           "text": {
             "default": "Next",
-            "hi": "आगामी"
+            "hi": "आगामी",
+            "es": "Siguiente"
           },
           "_row_num": 9
         },
@@ -745,238 +875,272 @@
           "string_token": "continue_button_label",
           "text": {
             "default": "Continue",
-            "hi": "जारी रहना"
+            "hi": "जारी रहना",
+            "es": "Continuar"
           },
           "_row_num": 10
         },
         "select_one_dropdown_label": {
           "string_token": "select_one_dropdown_label",
           "text": {
-            "default": "Choose Option"
+            "default": "Choose Option",
+            "es": "Elige una opción"
           },
           "_row_num": 11
         },
         "requiredValueErr": {
           "string_token": "requiredValueErr",
           "text": {
-            "default": "Required value was not provided."
+            "default": "Required value was not provided.",
+            "es": "Dato requerido no proporcionado"
           },
           "_row_num": 12
         },
         "geopoint_button_label": {
           "string_token": "geopoint_button_label",
           "text": {
-            "default": "Record Location"
+            "default": "Record Location",
+            "es": "Grabar ubicación"
           },
           "_row_num": 13
         },
         "geopoint_latitude_component": {
           "string_token": "geopoint_latitude_component",
           "text": {
-            "default": "Latitude: {{value.latitude}}"
+            "default": "Latitude: {{value.latitude}}",
+            "es": "Latitud: {{value.latitude}}"
           },
           "_row_num": 14
         },
         "geopoint_longitude_component": {
           "string_token": "geopoint_longitude_component",
           "text": {
-            "default": "Longitude: {{value.longitude}}"
+            "default": "Longitude: {{value.longitude}}",
+            "es": "Longitud: {{value.longitude}}"
           },
           "_row_num": 15
         },
         "geopoint_altitude_component": {
           "string_token": "geopoint_altitude_component",
           "text": {
-            "default": "Altitude: {{value.altitude}}"
+            "default": "Altitude: {{value.altitude}}",
+            "es": "Altitud: {{value.altitude}}"
           },
           "_row_num": 16
         },
         "geopoint_accuracy_component": {
           "string_token": "geopoint_accuracy_component",
           "text": {
-            "default": "Accuracy: {{value.accuracy}}"
+            "default": "Accuracy: {{value.accuracy}}",
+            "es": "Precisión: {{value.accuracy}}"
           },
           "_row_num": 17
         },
         "waiting_text": {
           "string_token": "waiting_text",
           "text": {
-            "default": "Please wait…"
+            "default": "Please wait…",
+            "es": "Por favor, espere…"
           },
           "_row_num": 18
         },
         "take_video_button_label": {
           "string_token": "take_video_button_label",
           "text": {
-            "default": "Take Video"
+            "default": "Take Video",
+            "es": "Graba un vídeo"
           },
           "_row_num": 19
         },
         "choose_video_button_label": {
           "string_token": "choose_video_button_label",
           "text": {
-            "default": "Choose Video"
+            "default": "Choose Video",
+            "es": "Elige un vídeo"
           },
           "_row_num": 20
         },
         "video_control_not_supported": {
           "string_token": "video_control_not_supported",
           "text": {
-            "default": "Video controls are not supported."
+            "default": "Video controls are not supported.",
+            "es": "Controles de vídeo no son compatibles."
           },
           "_row_num": 21
         },
         "take_audio_button_label": {
           "string_token": "take_audio_button_label",
           "text": {
-            "default": "Capture Audio"
+            "default": "Capture Audio",
+            "es": "Captura audio"
           },
           "_row_num": 22
         },
         "choose_audio_button_label": {
           "string_token": "choose_audio_button_label",
           "text": {
-            "default": "Choose Audio"
+            "default": "Choose Audio",
+            "es": "Elige audio"
           },
           "_row_num": 23
         },
         "audio_control_not_supported": {
           "string_token": "audio_control_not_supported",
           "text": {
-            "default": "Audio controls are not supported."
+            "default": "Audio controls are not supported.",
+            "es": "Controles de audio no son compatibles."
           },
           "_row_num": 24
         },
         "confirm_action_no_label": {
           "string_token": "confirm_action_no_label",
           "text": {
-            "default": "NO"
+            "default": "NO",
+            "es": "NO"
           },
           "_row_num": 25
         },
         "confirm_action_yes_label": {
           "string_token": "confirm_action_yes_label",
           "text": {
-            "default": "YES"
+            "default": "YES",
+            "es": "SI"
           },
           "_row_num": 26
         },
         "external_link_button_label": {
           "string_token": "external_link_button_label",
           "text": {
-            "default": "Follow link"
+            "default": "Follow link",
+            "es": "Sigue el enlace"
           },
           "_row_num": 27
         },
         "survey_form_identification": {
           "string_token": "survey_form_identification",
           "text": {
-            "default": "<div><center>ODK Survey</center><hr></div><div><p>Form name: {{localizeText form_title}}</p>{{#if form_version}}<p>Form version: {{form_version}}</p>{{/if}}<hr></div>"
+            "default": "<div><center>ODK Survey</center><hr></div><div><p>Form name: {{localizeText form_title}}</p>{{#if form_version}}<p>Form version: {{form_version}}</p>{{/if}}<hr></div>",
+            "es": "<div><center>ODK Survey</center><hr></div><div><p>Nombre del Formulario: {{localizeText form_title}}</p>{{#if form_version}}<p>Version de Formulario: {{form_version}}</p>{{/if}}<hr></div>"
           },
           "_row_num": 28
         },
         "finalize_survey_instance_detail": {
           "string_token": "finalize_survey_instance_detail",
           "text": {
-            "default": "<p>You are at the end of instance: </p><p>\"{{display_field}}\"</p><hr>"
+            "default": "<p>You are at the end of instance: </p><p>\"{{display_field}}\"</p><hr>",
+            "es": "<p>Está en el final de la instancia: </p><p>\"{{display_field}}\"</p><hr>"
           },
           "_row_num": 29
         },
         "finalize_survey_button_label": {
           "string_token": "finalize_survey_button_label",
           "text": {
-            "default": "Finalize"
+            "default": "Finalize",
+            "es": "Finalizar"
           },
           "_row_num": 30
         },
         "save_as_incomplete_survey_button_label": {
           "string_token": "save_as_incomplete_survey_button_label",
           "text": {
-            "default": "Incomplete"
+            "default": "Incomplete",
+            "es": "Incompleto"
           },
           "_row_num": 31
         },
         "take_image_button_label": {
           "string_token": "take_image_button_label",
           "text": {
-            "default": "Take Photo"
+            "default": "Take Photo",
+            "es": "Tomé una foto"
           },
           "_row_num": 33
         },
         "choose_image_button_label": {
           "string_token": "choose_image_button_label",
           "text": {
-            "default": "Choose Image"
+            "default": "Choose Image",
+            "es": "Elige una imagen"
           },
           "_row_num": 34
         },
         "launch_intent_button_label": {
           "string_token": "launch_intent_button_label",
           "text": {
-            "default": "Launch Intent"
+            "default": "Launch Intent",
+            "es": "Lanzamiento de intención"
           },
           "_row_num": 35
         },
         "opening_survey_instance_detail": {
           "string_token": "opening_survey_instance_detail",
           "text": {
-            "default": "{{#if display_field}}\n        <p>You are at the start of instance: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>You are at the start of a new instance.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>Last saved:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>"
+            "default": "{{#if display_field}}\n        <p>You are at the start of instance: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>You are at the start of a new instance.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>Last saved:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>",
+            "es": "{{#if display_field}}\n        <p>estás en el inicio de la instancia: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>estás en el inicio de una nueva instancia.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>guardado por última vez:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>"
           },
           "_row_num": 36
         },
         "opening_survey_next_button_label": {
           "string_token": "opening_survey_next_button_label",
           "text": {
-            "default": "Go to next prompt"
+            "default": "Go to next prompt",
+            "es": "Ir al siguiente"
           },
           "_row_num": 37
         },
         "options_popup_language_heading": {
           "string_token": "options_popup_language_heading",
           "text": {
-            "default": "Language"
+            "default": "Language",
+            "es": "Idioma"
           },
           "_row_num": 38
         },
         "options_popup_contents_heading": {
           "string_token": "options_popup_contents_heading",
           "text": {
-            "default": "Contents"
+            "default": "Contents",
+            "es": "Contenido"
           },
           "_row_num": 39
         },
         "options_popup_ignore_changes_heading": {
           "string_token": "options_popup_ignore_changes_heading",
           "text": {
-            "default": "Ignore Changes + Exit"
+            "default": "Ignore Changes + Exit",
+            "es": "Ignorar cambios y salir"
           },
           "_row_num": 40
         },
         "options_popup_save_changes_heading": {
           "string_token": "options_popup_save_changes_heading",
           "text": {
-            "default": "Save Changes + Exit"
+            "default": "Save Changes + Exit",
+            "es": "Guardar cambios y salir"
           },
           "_row_num": 41
         },
         "options_popup_finalize_changes_heading": {
           "string_token": "options_popup_finalize_changes_heading",
           "text": {
-            "default": "Finalize Changes + Exit"
+            "default": "Finalize Changes + Exit",
+            "es": "Finalizar cambios y salir"
           },
           "_row_num": 42
         },
         "screen_popup_ok_button_label": {
           "string_token": "screen_popup_ok_button_label",
           "text": {
-            "default": "OK"
+            "default": "OK",
+            "es": "Confirmar"
           },
           "_row_num": 43
         },
         "select_with_other_other_label": {
           "string_token": "select_with_other_other_label",
           "text": {
-            "default": "Other:"
+            "default": "Other:",
+            "es": "Otro:"
           },
           "_row_num": 44
         },
@@ -984,93 +1148,130 @@
           "string_token": "select_deselect_label",
           "text": {
             "default": "Deselect",
-            "hi": "अचयनित"
+            "hi": "अचयनित",
+            "es": "Deseleccioanr"
           },
           "_row_num": 45
         },
         "take_signature_button_label": {
           "string_token": "take_signature_button_label",
           "text": {
-            "default": "Get Signature"
+            "default": "Get Signature",
+            "es": "Obtener firma"
           },
           "_row_num": 46
         },
         "instances_survey_create_button_label": {
           "string_token": "instances_survey_create_button_label",
           "text": {
-            "default": "Create new instance"
+            "default": "Create new instance",
+            "es": "Crear nueva instancia"
           },
           "_row_num": 47
         },
         "instances_no_saved_instances_label": {
           "string_token": "instances_no_saved_instances_label",
           "text": {
-            "default": "No saved instances."
+            "default": "No saved instances.",
+            "es": "Instancias no guardadas"
           },
           "_row_num": 48
         },
         "instances_last_save_date_label": {
           "string_token": "instances_last_save_date_label",
           "text": {
-            "default": "<p><strong>Last Save Date:</strong></p>"
+            "default": "<p><strong>Last Save Date:</strong></p>",
+            "es": "<p><strong>Última fecha guardada:</strong></p>"
           },
           "_row_num": 49
         },
         "instances_previously_created_instances_label": {
           "string_token": "instances_previously_created_instances_label",
           "text": {
-            "default": "<p>Previously created instances:</p>"
+            "default": "<p>Previously created instances:</p>",
+            "es": "<p>Instancias creadas previamente:</p>"
           },
           "_row_num": 50
         },
         "savepoint_type_finalized_text_label": {
           "string_token": "savepoint_type_finalized_text_label",
           "text": {
-            "default": "Finalized"
+            "default": "Finalized",
+            "es": "Finalizado"
           },
           "_row_num": 51
         },
         "savepoint_type_incomplete_text_label": {
           "string_token": "savepoint_type_incomplete_text_label",
           "text": {
-            "default": "Incomplete"
+            "default": "Incomplete",
+            "es": "Incompleto"
           },
           "_row_num": 52
         },
         "savepoint_type_checkpoint_text_label": {
           "string_token": "savepoint_type_checkpoint_text_label",
           "text": {
-            "default": "Checkpoint"
+            "default": "Checkpoint",
+            "es": "Cambios no guardados"
           },
           "_row_num": 53
         },
         "linked_table_new_instance_label": {
           "string_token": "linked_table_new_instance_label",
           "text": {
-            "default": "Create new instance"
+            "default": "Create new instance",
+            "es": "Crear nueva instancia"
           },
           "_row_num": 54
         },
         "barcode_button_label": {
           "string_token": "barcode_button_label",
           "text": {
-            "default": "Scan Barcode"
+            "default": "Scan Barcode",
+            "es": "Escanear Código de Barras"
           },
           "_row_num": 55
         },
         "invalid_numeric_message": {
           "string_token": "invalid_numeric_message",
           "text": {
-            "default": "Numeric value expected"
+            "default": "Numeric value expected",
+            "es": "Valor numérico esperado"
           },
           "_row_num": 56
         },
         "invalid_integer_message": {
           "string_token": "invalid_integer_message",
           "text": {
-            "default": "Integer value expected"
+            "default": "Integer value expected",
+            "es": "Valor entero esperado"
           },
           "_row_num": 57
+        },
+        "confirm_exit_label": {
+          "string_token": "confirm_exit_label",
+          "text": {
+            "default": "Exit",
+            "es": "Salir"
+          },
+          "_row_num": 58
+        },
+        "confirm_cancel_label": {
+          "string_token": "confirm_cancel_label",
+          "text": {
+            "default": "Cancel",
+            "es": "Cancelar"
+          },
+          "_row_num": 59
+        },
+        "confirm_message": {
+          "string_token": "confirm_message",
+          "text": {
+            "default": "Are you sure you want to exit and lose all changes?",
+            "es": "¿Estás seguro de que quieres salir y perder todos los cambios?"
+          },
+          "_row_num": 60
         }
       }
     },
@@ -1086,6 +1287,7 @@
                 "text": {
                   "en": "English",
                   "hi": "अंग्रेज़ी",
+                  "es": "Inglés",
                   "default": "English"
                 }
               }
@@ -1099,12 +1301,27 @@
                 "text": {
                   "en": "Hindi",
                   "hi": "हिंदी",
+                  "es": "Hindi",
                   "default": "Hindi"
                 }
               }
             },
             "_row_num": 8,
             "name": "hi"
+          },
+          {
+            "display": {
+              "locale": {
+                "text": {
+                  "en": "Spanish",
+                  "hi": "स्पेनिश",
+                  "es": "Español",
+                  "default": "Spanish"
+                }
+              }
+            },
+            "_row_num": 9,
+            "name": "es"
           }
         ]
       },
@@ -1144,6 +1361,7 @@
                 "text": {
                   "en": "Common Javascript Framework",
                   "hi": "सामान्य जावास्क्रिप्ट फ़्रेमवर्क",
+                  "es": "Marco común de Javascript",
                   "default": "Common Javascript Framework"
                 }
               }
@@ -1408,7 +1626,7 @@
         "_aspect": "default",
         "_key": "displayName",
         "_type": "object",
-        "_value": "{\"text\":{\"en\":\"Common Javascript Framework\",\"hi\":\"सामान्य जावास्क्रिप्ट फ़्रेमवर्क\",\"default\":\"Common Javascript Framework\"}}"
+        "_value": "{\"text\":{\"en\":\"Common Javascript Framework\",\"hi\":\"सामान्य जावास्क्रिप्ट फ़्रेमवर्क\",\"es\":\"Marco común de Javascript\",\"default\":\"Common Javascript Framework\"}}"
       }
     ]
   }
diff --git a/app/config/assets/framework/forms/framework.clean/framework.xlsx b/app/config/assets/framework/forms/framework.clean/framework.xlsx
index 2d49aff79..4916d3376 100644
Binary files a/app/config/assets/framework/forms/framework.clean/framework.xlsx and b/app/config/assets/framework/forms/framework.clean/framework.xlsx differ
diff --git a/app/config/assets/framework/frameworkDefinitions.clean.js b/app/config/assets/framework/frameworkDefinitions.clean.js
index 9f8a8d9e8..434666a65 100644
--- a/app/config/assets/framework/frameworkDefinitions.clean.js
+++ b/app/config/assets/framework/frameworkDefinitions.clean.js
@@ -3,35 +3,40 @@ window.odkFrameworkDefinitions = {
     "constraint_message": {
       "string_token": "constraint_message",
       "text": {
-        "default": "Constraint violated."
+        "default": "Constraint violated.",
+        "es": "Restricción incumplida"
       },
       "_row_num": 2
     },
     "invalid_value_message": {
       "string_token": "invalid_value_message",
       "text": {
-        "default": "Invalid value."
+        "default": "Invalid value.",
+        "es": "Valor no válido."
       },
       "_row_num": 3
     },
     "required_message": {
       "string_token": "required_message",
       "text": {
-        "default": "Required value not provided."
+        "default": "Required value not provided.",
+        "es": "Dato requerido no proporcionado"
       },
       "_row_num": 4
     },
     "required_exception_message": {
       "string_token": "required_exception_message",
       "text": {
-        "default": "Exception while evaluating required() expression. See console log."
+        "default": "Exception while evaluating required() expression. See console log.",
+        "es": "Excepción al evaluar la expresión requerido(). Ver consola de registro"
       },
       "_row_num": 5
     },
     "constraint_exception_message": {
       "string_token": "constraint_exception_message",
       "text": {
-        "default": "Exception while evaluating constraint() expression. See console log."
+        "default": "Exception while evaluating constraint() expression. See console log.",
+        "es": "Excepción al evaluar la expresión restricción(). Ver consola de registro"
       },
       "_row_num": 6
     },
@@ -39,7 +44,8 @@ window.odkFrameworkDefinitions = {
       "string_token": "acknLabel",
       "text": {
         "default": "Acknowledge",
-        "hindi": "स्वीकार करना"
+        "hi": "स्वीकार करना",
+        "es": "Admitir"
       },
       "_row_num": 7
     },
@@ -47,7 +53,8 @@ window.odkFrameworkDefinitions = {
       "string_token": "back_button_label",
       "text": {
         "default": "Back",
-        "hindi": "लौटना"
+        "hi": "लौटना",
+        "es": "Atrás"
       },
       "_row_num": 8
     },
@@ -55,7 +62,8 @@ window.odkFrameworkDefinitions = {
       "string_token": "next_button_label",
       "text": {
         "default": "Next",
-        "hindi": "आगामी"
+        "hi": "आगामी",
+        "es": "Siguiente"
       },
       "_row_num": 9
     },
@@ -63,238 +71,272 @@ window.odkFrameworkDefinitions = {
       "string_token": "continue_button_label",
       "text": {
         "default": "Continue",
-        "hindi": "जारी रहना"
+        "hi": "जारी रहना",
+        "es": "Continuar"
       },
       "_row_num": 10
     },
     "select_one_dropdown_label": {
       "string_token": "select_one_dropdown_label",
       "text": {
-        "default": "Choose Option"
+        "default": "Choose Option",
+        "es": "Elige una opción"
       },
       "_row_num": 11
     },
     "requiredValueErr": {
       "string_token": "requiredValueErr",
       "text": {
-        "default": "Required value was not provided."
+        "default": "Required value was not provided.",
+        "es": "Dato requerido no proporcionado"
       },
       "_row_num": 12
     },
     "geopoint_button_label": {
       "string_token": "geopoint_button_label",
       "text": {
-        "default": "Record Location"
+        "default": "Record Location",
+        "es": "Grabar ubicación"
       },
       "_row_num": 13
     },
     "geopoint_latitude_component": {
       "string_token": "geopoint_latitude_component",
       "text": {
-        "default": "Latitude: {{value.latitude}}"
+        "default": "Latitude: {{value.latitude}}",
+        "es": "Latitud: {{value.latitude}}"
       },
       "_row_num": 14
     },
     "geopoint_longitude_component": {
       "string_token": "geopoint_longitude_component",
       "text": {
-        "default": "Longitude: {{value.longitude}}"
+        "default": "Longitude: {{value.longitude}}",
+        "es": "Longitud: {{value.longitude}}"
       },
       "_row_num": 15
     },
     "geopoint_altitude_component": {
       "string_token": "geopoint_altitude_component",
       "text": {
-        "default": "Altitude: {{value.altitude}}"
+        "default": "Altitude: {{value.altitude}}",
+        "es": "Altitud: {{value.altitude}}"
       },
       "_row_num": 16
     },
     "geopoint_accuracy_component": {
       "string_token": "geopoint_accuracy_component",
       "text": {
-        "default": "Accuracy: {{value.accuracy}}"
+        "default": "Accuracy: {{value.accuracy}}",
+        "es": "Precisión: {{value.accuracy}}"
       },
       "_row_num": 17
     },
     "waiting_text": {
       "string_token": "waiting_text",
       "text": {
-        "default": "Please wait…"
+        "default": "Please wait…",
+        "es": "Por favor, espere…"
       },
       "_row_num": 18
     },
     "take_video_button_label": {
       "string_token": "take_video_button_label",
       "text": {
-        "default": "Take Video"
+        "default": "Take Video",
+        "es": "Graba un vídeo"
       },
       "_row_num": 19
     },
     "choose_video_button_label": {
       "string_token": "choose_video_button_label",
       "text": {
-        "default": "Choose Video"
+        "default": "Choose Video",
+        "es": "Elige un vídeo"
       },
       "_row_num": 20
     },
     "video_control_not_supported": {
       "string_token": "video_control_not_supported",
       "text": {
-        "default": "Video controls are not supported."
+        "default": "Video controls are not supported.",
+        "es": "Controles de vídeo no son compatibles."
       },
       "_row_num": 21
     },
     "take_audio_button_label": {
       "string_token": "take_audio_button_label",
       "text": {
-        "default": "Capture Audio"
+        "default": "Capture Audio",
+        "es": "Captura audio"
       },
       "_row_num": 22
     },
     "choose_audio_button_label": {
       "string_token": "choose_audio_button_label",
       "text": {
-        "default": "Choose Audio"
+        "default": "Choose Audio",
+        "es": "Elige audio"
       },
       "_row_num": 23
     },
     "audio_control_not_supported": {
       "string_token": "audio_control_not_supported",
       "text": {
-        "default": "Audio controls are not supported."
+        "default": "Audio controls are not supported.",
+        "es": "Controles de audio no son compatibles."
       },
       "_row_num": 24
     },
     "confirm_action_no_label": {
       "string_token": "confirm_action_no_label",
       "text": {
-        "default": "NO"
+        "default": "NO",
+        "es": "NO"
       },
       "_row_num": 25
     },
     "confirm_action_yes_label": {
       "string_token": "confirm_action_yes_label",
       "text": {
-        "default": "YES"
+        "default": "YES",
+        "es": "SI"
       },
       "_row_num": 26
     },
     "external_link_button_label": {
       "string_token": "external_link_button_label",
       "text": {
-        "default": "Follow link"
+        "default": "Follow link",
+        "es": "Sigue el enlace"
       },
       "_row_num": 27
     },
     "survey_form_identification": {
       "string_token": "survey_form_identification",
       "text": {
-        "default": "<div><center>ODK Survey</center><hr></div><div><p>Form name: {{localizeText form_title}}</p>{{#if form_version}}<p>Form version: {{form_version}}</p>{{/if}}<hr></div>"
+        "default": "<div><center>ODK Survey</center><hr></div><div><p>Form name: {{localizeText form_title}}</p>{{#if form_version}}<p>Form version: {{form_version}}</p>{{/if}}<hr></div>",
+        "es": "<div><center>ODK Survey</center><hr></div><div><p>Nombre del Formulario: {{localizeText form_title}}</p>{{#if form_version}}<p>Version de Formulario: {{form_version}}</p>{{/if}}<hr></div>"
       },
       "_row_num": 28
     },
     "finalize_survey_instance_detail": {
       "string_token": "finalize_survey_instance_detail",
       "text": {
-        "default": "<p>You are at the end of instance: </p><p>\"{{display_field}}\"</p><hr>"
+        "default": "<p>You are at the end of instance: </p><p>\"{{display_field}}\"</p><hr>",
+        "es": "<p>Está en el final de la instancia: </p><p>\"{{display_field}}\"</p><hr>"
       },
       "_row_num": 29
     },
     "finalize_survey_button_label": {
       "string_token": "finalize_survey_button_label",
       "text": {
-        "default": "Finalize"
+        "default": "Finalize",
+        "es": "Finalizar"
       },
       "_row_num": 30
     },
     "save_as_incomplete_survey_button_label": {
       "string_token": "save_as_incomplete_survey_button_label",
       "text": {
-        "default": "Incomplete"
+        "default": "Incomplete",
+        "es": "Incompleto"
       },
       "_row_num": 31
     },
     "take_image_button_label": {
       "string_token": "take_image_button_label",
       "text": {
-        "default": "Take Photo"
+        "default": "Take Photo",
+        "es": "Tomé una foto"
       },
       "_row_num": 33
     },
     "choose_image_button_label": {
       "string_token": "choose_image_button_label",
       "text": {
-        "default": "Choose Image"
+        "default": "Choose Image",
+        "es": "Elige una imagen"
       },
       "_row_num": 34
     },
     "launch_intent_button_label": {
       "string_token": "launch_intent_button_label",
       "text": {
-        "default": "Launch Intent"
+        "default": "Launch Intent",
+        "es": "Lanzamiento de intención"
       },
       "_row_num": 35
     },
     "opening_survey_instance_detail": {
       "string_token": "opening_survey_instance_detail",
       "text": {
-        "default": "{{#if display_field}}\n        <p>You are at the start of instance: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>You are at the start of a new instance.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>Last saved:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>"
+        "default": "{{#if display_field}}\n        <p>You are at the start of instance: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>You are at the start of a new instance.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>Last saved:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>",
+        "es": "{{#if display_field}}\n        <p>estás en el inicio de la instancia: </p>\n        <p>\"{{display_field}}\"</p> \n  {{else}}\n        <p>estás en el inicio de una nueva instancia.</p>\n  {{/if}}\n        <hr>\n        {{#if last_save_date}}\n            <p>guardado por última vez:</p> \n            <p>{{last_save_date}}</p>\n        {{/if}}\n        <hr>"
       },
       "_row_num": 36
     },
     "opening_survey_next_button_label": {
       "string_token": "opening_survey_next_button_label",
       "text": {
-        "default": "Go to next prompt"
+        "default": "Go to next prompt",
+        "es": "Ir al siguiente"
       },
       "_row_num": 37
     },
     "options_popup_language_heading": {
       "string_token": "options_popup_language_heading",
       "text": {
-        "default": "Language"
+        "default": "Language",
+        "es": "Idioma"
       },
       "_row_num": 38
     },
     "options_popup_contents_heading": {
       "string_token": "options_popup_contents_heading",
       "text": {
-        "default": "Contents"
+        "default": "Contents",
+        "es": "Contenido"
       },
       "_row_num": 39
     },
     "options_popup_ignore_changes_heading": {
       "string_token": "options_popup_ignore_changes_heading",
       "text": {
-        "default": "Ignore Changes + Exit"
+        "default": "Ignore Changes + Exit",
+        "es": "Ignorar cambios y salir"
       },
       "_row_num": 40
     },
     "options_popup_save_changes_heading": {
       "string_token": "options_popup_save_changes_heading",
       "text": {
-        "default": "Save Changes + Exit"
+        "default": "Save Changes + Exit",
+        "es": "Guardar cambios y salir"
       },
       "_row_num": 41
     },
     "options_popup_finalize_changes_heading": {
       "string_token": "options_popup_finalize_changes_heading",
       "text": {
-        "default": "Finalize Changes + Exit"
+        "default": "Finalize Changes + Exit",
+        "es": "Finalizar cambios y salir"
       },
       "_row_num": 42
     },
     "screen_popup_ok_button_label": {
       "string_token": "screen_popup_ok_button_label",
       "text": {
-        "default": "OK"
+        "default": "OK",
+        "es": "Confirmar"
       },
       "_row_num": 43
     },
     "select_with_other_other_label": {
       "string_token": "select_with_other_other_label",
       "text": {
-        "default": "Other:"
+        "default": "Other:",
+        "es": "Otro:"
       },
       "_row_num": 44
     },
@@ -302,93 +344,130 @@ window.odkFrameworkDefinitions = {
       "string_token": "select_deselect_label",
       "text": {
         "default": "Deselect",
-        "hindi": "अचयनित"
+        "hi": "अचयनित",
+        "es": "Deseleccioanr"
       },
       "_row_num": 45
     },
     "take_signature_button_label": {
       "string_token": "take_signature_button_label",
       "text": {
-        "default": "Get Signature"
+        "default": "Get Signature",
+        "es": "Obtener firma"
       },
       "_row_num": 46
     },
     "instances_survey_create_button_label": {
       "string_token": "instances_survey_create_button_label",
       "text": {
-        "default": "Create new instance"
+        "default": "Create new instance",
+        "es": "Crear nueva instancia"
       },
       "_row_num": 47
     },
     "instances_no_saved_instances_label": {
       "string_token": "instances_no_saved_instances_label",
       "text": {
-        "default": "No saved instances."
+        "default": "No saved instances.",
+        "es": "Instancias no guardadas"
       },
       "_row_num": 48
     },
     "instances_last_save_date_label": {
       "string_token": "instances_last_save_date_label",
       "text": {
-        "default": "<p><strong>Last Save Date:</strong></p>"
+        "default": "<p><strong>Last Save Date:</strong></p>",
+        "es": "<p><strong>Última fecha guardada:</strong></p>"
       },
       "_row_num": 49
     },
     "instances_previously_created_instances_label": {
       "string_token": "instances_previously_created_instances_label",
       "text": {
-        "default": "<p>Previously created instances:</p>"
+        "default": "<p>Previously created instances:</p>",
+        "es": "<p>Instancias creadas previamente:</p>"
       },
       "_row_num": 50
     },
     "savepoint_type_finalized_text_label": {
       "string_token": "savepoint_type_finalized_text_label",
       "text": {
-        "default": "Finalized"
+        "default": "Finalized",
+        "es": "Finalizado"
       },
       "_row_num": 51
     },
     "savepoint_type_incomplete_text_label": {
       "string_token": "savepoint_type_incomplete_text_label",
       "text": {
-        "default": "Incomplete"
+        "default": "Incomplete",
+        "es": "Incompleto"
       },
       "_row_num": 52
     },
     "savepoint_type_checkpoint_text_label": {
       "string_token": "savepoint_type_checkpoint_text_label",
       "text": {
-        "default": "Checkpoint"
+        "default": "Checkpoint",
+        "es": "Cambios no guardados"
       },
       "_row_num": 53
     },
     "linked_table_new_instance_label": {
       "string_token": "linked_table_new_instance_label",
       "text": {
-        "default": "Create new instance"
+        "default": "Create new instance",
+        "es": "Crear nueva instancia"
       },
       "_row_num": 54
     },
     "barcode_button_label": {
       "string_token": "barcode_button_label",
       "text": {
-        "default": "Scan Barcode"
+        "default": "Scan Barcode",
+        "es": "Escanear Código de Barras"
       },
       "_row_num": 55
     },
     "invalid_numeric_message": {
       "string_token": "invalid_numeric_message",
       "text": {
-        "default": "Numeric value expected"
+        "default": "Numeric value expected",
+        "es": "Valor numérico esperado"
       },
       "_row_num": 56
     },
     "invalid_integer_message": {
       "string_token": "invalid_integer_message",
       "text": {
-        "default": "Integer value expected"
+        "default": "Integer value expected",
+        "es": "Valor entero esperado"
       },
       "_row_num": 57
+    },
+    "confirm_exit_label": {
+      "string_token": "confirm_exit_label",
+      "text": {
+        "default": "Exit",
+        "es": "Salir"
+      },
+      "_row_num": 58
+    },
+    "confirm_cancel_label": {
+      "string_token": "confirm_cancel_label",
+      "text": {
+        "default": "Cancel",
+        "es": "Cancelar"
+      },
+      "_row_num": 59
+    },
+    "confirm_message": {
+      "string_token": "confirm_message",
+      "text": {
+        "default": "Are you sure you want to exit and lose all changes?",
+        "es": "¿Estás seguro de que quieres salir y perder todos los cambios?"
+      },
+      "_row_num": 60
     }
   }
 }
\ No newline at end of file
diff --git a/app/config/assets/index.clean.html b/app/config/assets/index.clean.html
index 1d5576b1e..f5f1e7ec6 100644
--- a/app/config/assets/index.clean.html
+++ b/app/config/assets/index.clean.html
@@ -13,19 +13,5 @@
 
     <body>
 		<center>Replace this config/assets/index.html with your own.</center>
-		<!-- provide easy access to the framework form -->
-        <center><button id="frameworkbutton" type="button">Open Framework Form</button></center>
-		<script type="text/javascript">
-		//<![CDATA[
-		'use strict';
-		/* globals $ */
-		$(function() {
-			$('#frameworkbutton').on(
-					'click',
-					function() {
-						odkTables.editRowWithSurveyDefault(null, 'framework', null);
-					});
-			})
-		//]]></script>
     </body>
 </html>