From eee49f5a31e1b80dcac0a6138ec6e808a5ed5c62 Mon Sep 17 00:00:00 2001
From: Aaron Huttner <Double@Aarons-MacBook-Pro.local>
Date: Sat, 27 Aug 2016 17:00:54 -0400
Subject: [PATCH] Add spanish translations Add Spanish translations for enums
 and some strings. Version bump.

---
 app/build.gradle                              |   4 +-
 .../res/values/debug_strings.xml              |   8 +-
 app/src/internalDebug/res/values/strings.xml  |   2 +-
 app/src/internalDebug/res/values/titles.xml   |   4 +-
 .../grommet/data/db/model/Name.java           |  25 ++-
 .../grommet/data/db/model/RockyRequest.java   |  83 ++++---
 .../ui/registration/RegistrationActivity.java |  16 ++
 .../ReviewAndConfirmFragment.java             |   4 +
 .../rockthevote/grommet/util/LocaleUtils.java |  27 +++
 app/src/main/res/menu/registration.xml        |   4 +-
 app/src/main/res/values-es/strings.xml        | 210 ++++++++++++++++++
 .../main/res/values/open_source_licenses.xml  |  20 +-
 app/src/main/res/values/strings.xml           |  67 +++---
 13 files changed, 384 insertions(+), 90 deletions(-)
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/LocaleUtils.java
 create mode 100644 app/src/main/res/values-es/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index dbe72730..1994d227 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 // Manifest version information!
 def versionMajor = 1
-def versionMinor = 0
-def versionPatch = 9
+def versionMinor = 1
+def versionPatch = 0
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 apply plugin: 'com.android.application'
diff --git a/app/src/internalDebug/res/values/debug_strings.xml b/app/src/internalDebug/res/values/debug_strings.xml
index edaba27b..b95cefaf 100644
--- a/app/src/internalDebug/res/values/debug_strings.xml
+++ b/app/src/internalDebug/res/values/debug_strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="development_settings">Development Settings</string>
-  <string name="debug_drawer_network_endpoint_description">Enter the URL of the server to which you want to connect.\n\ne.g., https://bob-loblaw.local/1.0/</string>
-  <string name="debug_drawer_network_proxy_description">Enter the host of the server through which you want to proxy.\n\ne.g., 12.34.56.78:9000</string>
-  <string name="debug_drawer_welcome">Debug settings are available in this drawer.</string>
+  <string name="development_settings" translatable="false">Development Settings</string>
+  <string name="debug_drawer_network_endpoint_description" translatable="false">Enter the URL of the server to which you want to connect.\n\ne.g., https://bob-loblaw.local/1.0/</string>
+  <string name="debug_drawer_network_proxy_description" translatable="false">Enter the host of the server through which you want to proxy.\n\ne.g., 12.34.56.78:9000</string>
+  <string name="debug_drawer_welcome" translatable="false">Debug settings are available in this drawer.</string>
 </resources>
diff --git a/app/src/internalDebug/res/values/strings.xml b/app/src/internalDebug/res/values/strings.xml
index 9dfc494f..f000e876 100644
--- a/app/src/internalDebug/res/values/strings.xml
+++ b/app/src/internalDebug/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="tos_text_blurb">Lorem ipsum dolor sit amet, aperiri gubergren voluptatibus ea vis.
+    <string name="tos_text_blurb" translatable="false">Lorem ipsum dolor sit amet, aperiri gubergren voluptatibus ea vis.
         Harum nullam referrentur no vel. Partem saperet appellantur nec id. Malis latine vituperata
         at cum.Duo tota ceteros inimicus id, est te oblique consulatu complectitur, id dolor iuvaret
         consequuntur usu. Scripta iuvaret repudiare eam te, usu prima inciderint ex. Ad eum eirmod
diff --git a/app/src/internalDebug/res/values/titles.xml b/app/src/internalDebug/res/values/titles.xml
index 22358ce6..53b3a998 100644
--- a/app/src/internalDebug/res/values/titles.xml
+++ b/app/src/internalDebug/res/values/titles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="application_name">Grommet Sample Internal Debug</string>
-  <string name="launcher_name">Grommet Internal (D)</string>
+  <string name="application_name" translatable="false">Grommet Sample Internal Debug</string>
+  <string name="launcher_name" translatable="false">Grommet Internal (D)</string>
 </resources>
diff --git a/app/src/main/java/com/rockthevote/grommet/data/db/model/Name.java b/app/src/main/java/com/rockthevote/grommet/data/db/model/Name.java
index 1df1deb5..9442f353 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/db/model/Name.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/db/model/Name.java
@@ -12,6 +12,8 @@
 import com.rockthevote.grommet.util.Strings;
 import com.squareup.sqlbrite.BriteDatabase;
 
+import java.util.Locale;
+
 import rx.functions.Func1;
 
 @AutoValue
@@ -202,24 +204,35 @@ public static Suffix fromString(String suffix) {
     }
 
     public enum Prefix {
-        MR("Mr"), MS("Ms"), MRS("Mrs"), MISS("Miss");
+        MR("Mr", "Sr"),
+        MS("Ms", "Ms"), // intentionally the same
+        MRS("Mrs", "Srta"),
+        MISS("Miss", "Sra");
 
-        private final String title;
+        private final String enTitle;
+        private final String esTitle;
 
-        Prefix(String title) {
-            this.title = title;
+        Prefix(String enTitle, String esTitle) {
+            this.enTitle = enTitle;
+            this.esTitle = esTitle;
         }
 
         @Override
         @NonNull
         public String toString() {
-            return title;
+            if ("es".equals(Locale.getDefault().getLanguage())) {
+                return esTitle;
+            } else {
+                // default to english
+                return enTitle;
+            }
         }
 
         @NonNull
         public static Prefix fromString(String title) {
             for (Prefix value : Prefix.values()) {
-                if (value.title.equals(title)) {
+                if (value.enTitle.equals(title) ||
+                        value.esTitle.equals(title)) {
                     return value;
                 }
             }
diff --git a/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java b/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java
index a4f0295a..cd1abbcb 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java
@@ -12,6 +12,7 @@
 import com.rockthevote.grommet.util.Dates;
 
 import java.util.Date;
+import java.util.Locale;
 
 import rx.functions.Func1;
 
@@ -286,29 +287,37 @@ public ContentValues build() {
     }
 
     public enum Race {
-        OTHER("Other"),
-        AM_IND_AK_NATIVE("American Indian / Alaskan Native"),
-        ASIAN_PACIFIC_ISLANDER("Asian / Pacific Islander"),
-        BLACK("Black (not Hispanic)"),
-        HISPANIC("Hispanic"),
-        MULTI_RACIAL("Multi-Racial"),
-        WHITE("White (Not Hispanic)"),
-        DECLINE("Decline to state");
+        OTHER("Other", "OTRO"),
+        AM_IND_AK_NATIVE("American Indian / Alaskan Native", "Nativoamericano"),
+        ASIAN_PACIFIC_ISLANDER("Asian / Pacific Islander", "Asiatico"),
+        BLACK("Black (not Hispanic)", "Afroamericano"),
+        HISPANIC("Hispanic", "Hispano"),
+        MULTI_RACIAL("Multi-Racial", "Multi"),
+        WHITE("White (Not Hispanic)", "Anglosajón"),
+        DECLINE("Decline to state", "Rechazar");
 
-        private final String race;
+        private final String enRace;
+        private final String esRace;
 
-        Race(String race) {
-            this.race = race;
+        Race(String enRace, String esRace) {
+            this.enRace = enRace;
+            this.esRace = esRace;
         }
 
         @Override
         public String toString() {
-            return race;
+            if ("es".equals(Locale.getDefault().getLanguage())) {
+                return esRace;
+            } else {
+                // default to english
+                return enRace;
+            }
         }
 
         public static Race fromString(String race) {
             for (Race val : values()) {
-                if (val.toString().equals(race)) {
+                if (val.enRace.equals(race) ||
+                        val.esRace.equals(race)) {
                     return val;
                 }
             }
@@ -317,25 +326,33 @@ public static Race fromString(String race) {
     }
 
     public enum Party {
-        DEMOCRATIC("Democratic"),
-        REPUBLICAN("Republican"),
-        NO_PARTY("none"),
-        OTHER_PARTY("Other");
+        DEMOCRATIC("Democratic", "Demócrata"),
+        REPUBLICAN("Republican", "Republicano"),
+        NO_PARTY("None", "Ninguno"),
+        OTHER_PARTY("Other", "Otro");
 
-        private final String party;
+        private final String enParty;
+        private final String esParty;
 
-        Party(String party) {
-            this.party = party;
+        Party(String enParty, String esParty) {
+            this.enParty = enParty;
+            this.esParty = esParty;
         }
 
         @Override
         public String toString() {
-            return party;
+            if ("es".equals(Locale.getDefault().getLanguage())) {
+                return esParty;
+            } else {
+                // default to english
+                return enParty;
+            }
         }
 
         public static Party fromString(String party) {
             for (Party val : values()) {
-                if (val.toString().equals(party)) {
+                if (val.enParty.equals(party) ||
+                        val.esParty.equals(party)) {
                     return val;
                 }
             }
@@ -373,23 +390,33 @@ public static Status fromString(String status) {
     }
 
     public enum PhoneType {
-        MOBILE("Mobile"), HOME("Home"), WORK("Work");
+        MOBILE("Mobile", "Móvil"),
+        HOME("Home", "Casa"),
+        WORK("Work", "Trabajo");
 
-        private final String phoneType;
+        private final String enPhoneType;
+        private final String esPhoneType;
 
-        PhoneType(String phoneType) {
-            this.phoneType = phoneType;
+        PhoneType(String enPhoneType, String esPhoneType) {
+            this.enPhoneType = enPhoneType;
+            this.esPhoneType = esPhoneType;
         }
 
         @Override
         public @NonNull String toString() {
-            return phoneType;
+            if ("es".equals(Locale.getDefault().getLanguage())) {
+                return esPhoneType;
+            } else {
+                // default to english
+                return enPhoneType;
+            }
         }
 
         @NonNull
         public static PhoneType fromString(String phoneType) {
             for (PhoneType value : PhoneType.values()) {
-                if (value.phoneType.equals(phoneType)) {
+                if (value.enPhoneType.equals(phoneType) ||
+                        value.esPhoneType.equals(phoneType)) {
                     return value;
                 }
             }
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
index 17cadaa6..55502677 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
@@ -20,8 +20,11 @@
 import com.rockthevote.grommet.ui.ViewContainer;
 import com.rockthevote.grommet.ui.misc.StepperTabLayout;
 import com.rockthevote.grommet.util.KeyboardUtil;
+import com.rockthevote.grommet.util.LocaleUtils;
 import com.squareup.sqlbrite.BriteDatabase;
 
+import java.util.Locale;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -52,6 +55,10 @@ public class RegistrationActivity extends BaseActivity {
 
     private KeyboardUtil keyboardUtil;
 
+    public RegistrationActivity() {
+        LocaleUtils.updateConfig(this);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,6 +122,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_cancel:
                 showCancelDialog();
                 return true;
+            case R.id.action_english:
+                LocaleUtils.setLocale(new Locale("en"));
+                recreate();
+                return true;
+            case R.id.action_espanol:
+                LocaleUtils.setLocale(new Locale("es"));
+                recreate();
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -137,6 +152,7 @@ private void showCancelDialog() {
                             RockyRequest._ID + " = ? ",
                             String.valueOf(rockyRequestRowId.get()));
 
+                    LocaleUtils.setLocale(new Locale("en"));
                     finish();
 
                 }))
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
index 1fc73169..0af5971a 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
@@ -24,10 +24,12 @@
 import com.rockthevote.grommet.data.prefs.EventRegTotal;
 import com.rockthevote.grommet.util.Dates;
 import com.rockthevote.grommet.util.Images;
+import com.rockthevote.grommet.util.LocaleUtils;
 import com.squareup.sqlbrite.BriteDatabase;
 
 import java.io.ByteArrayOutputStream;
 import java.util.List;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -252,6 +254,8 @@ public void onRegisterClick(View v) {
             RegistrationCompleteDialogFragment dialog = new RegistrationCompleteDialogFragment();
             dialog.setCancelable(false);
             dialog.show(getFragmentManager(), "complete_dialog");
+
+            LocaleUtils.setLocale(new Locale("en"));
         } else {
             signaturePadError.setVisibility(View.VISIBLE);
         }
diff --git a/app/src/main/java/com/rockthevote/grommet/util/LocaleUtils.java b/app/src/main/java/com/rockthevote/grommet/util/LocaleUtils.java
new file mode 100644
index 00000000..c162c16a
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/LocaleUtils.java
@@ -0,0 +1,27 @@
+package com.rockthevote.grommet.util;
+
+import android.content.res.Configuration;
+import android.os.Build;
+import android.view.ContextThemeWrapper;
+
+import java.util.Locale;
+
+public class LocaleUtils {
+
+    private static Locale sLocale;
+
+    public static void setLocale(Locale locale) {
+        sLocale = locale;
+        if (sLocale != null) {
+            Locale.setDefault(sLocale);
+        }
+    }
+
+    public static void updateConfig(ContextThemeWrapper wrapper) {
+        if (sLocale != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            Configuration configuration = new Configuration();
+            configuration.setLocale(sLocale);
+            wrapper.applyOverrideConfiguration(configuration);
+        }
+    }
+}
diff --git a/app/src/main/res/menu/registration.xml b/app/src/main/res/menu/registration.xml
index a0972644..601b51e1 100644
--- a/app/src/main/res/menu/registration.xml
+++ b/app/src/main/res/menu/registration.xml
@@ -8,11 +8,11 @@
         app:showAsAction="always">
         <menu>
             <item
-                android:id="@+id/english"
+                android:id="@+id/action_english"
                 android:title="English"
                 app:showAsAction="never"/>
             <item
-                android:id="@+id/espanol"
+                android:id="@+id/action_espanol"
                 android:title="Espanol"
                 app:showAsAction="never"/>
         </menu>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..990061fb
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--Main Activity Strings-->
+    <string name="label_total_registered">Total Registered</string>
+    <string name="label_registered_event">Registered</string>
+    <string name="button_label_new_voter">New Voter</string>
+    <string name="event_details">Event Details</string>
+    <string name="error_partner_id">Invalid Partner ID</string>
+    <string name="label_partner_name_spinner">Validating Partner ID</string>
+
+    <!--Registration Activity Strings-->
+    <string name="cancel_dialog_message">¿Cancelar esta registración?</string>
+    <string name="dialog_yes">Sí</string>
+    <string name="dialog_no">No</string>
+    <string name="navigation_label_previous">anterior</string>
+    <string name="navigation_label_next">próximas</string>
+
+    <!--Eligibility Fragment Strings-->
+    <string name="fragment_title_new_registrant">Nombre</string>
+    <string name="label_us_citizen">Soy ciudadano de los Estados Unidos.</string>
+    <string name="label_eighteen_or_older">Tendré por lo menos 18 años en la fecha de las siguientes elecciones.</string>
+    <string name="label_has_id">Tengo una licencia de conducir de Pennsylvania.</string>
+    <string name="label_first_time_voter">Si es la primera vez que se inscribe para votar.</string>
+    <string name="label_name_prefix">Titulo</string>
+    <string name="label_first_name">Nombre</string>
+    <string name="label_middle_name">Segundo nombr</string>
+    <string name="label_last_name">Apellido</string>
+    <string name="label_name_suffix">Sufijo</string>
+    <string name="label_suffix">Sufijo</string>
+
+    <string name="label_birthday">Fecha de nacimiento</string>
+    <string name="section_label_eligibility">Elegibilidad</string>
+    <string name="section_label_basic_info">Información Básica</string>
+    <string name="section_label_new_registrant">Nueva Inscripción</string>
+    <string name="eighteen_or_older_err">Tendré por lo menos 18 años en la fecha de las siguientes elecciones.</string>
+    <string name="us_citizen_err">Soy ciudadano de los Estados Unidos.</string>
+    <string name="email_error">Dirección de email no es correcto</string>
+
+
+    <!--Personal Information Strings-->
+    <string name="fragment_title_personal_info">Dirección</string>
+    <string name="section_label_personal_info">Información de la Dirección</string>
+    <string name="section_label_name">el Nombre</string>
+    <string name="section_label_previous_name">Nombre anterior</string>
+    <string name="section_label_registration_address">Dirección de Residencia</string>
+    <string name="section_label_mailing_address">Dirección Postal</string>
+    <string name="section_label_previous_address">Dirección Anterior</string>
+    <string name="section_label_phone">Número de teléfono</string>
+    <string name="label_street">Dirección</string>
+    <string name="label_city">Ciudad</string>
+    <string name="label_zip_code">Código postal</string>
+    <string name="label_state">Estado</string>
+    <string name="label_unit_num">Unidad Número</string>
+    <string name="label_county">Condado donde vive</string>
+    <string name="checkbox_mailing_address_is_different">Consigo mi correo desde una dirección diferente a la de arriba.</string>
+    <string name="checkbox_address_changed">He cambiado mi dirección.</string>
+    <string name="label_send_copy_in_mail">I would like to receive a copy of my voter registration in the mail</string>
+    <string name="checkbox_name_changed">He cambiado mi nombre.</string>
+    <string name="label_receive_text">Estoy de acuerdo que puede llamar a %s y texto con actualizaciones importantes y recordatorios.</string>
+    <string name="county_empty_error">Condado donde vive es obligatorio</string>
+    <string name="label_no_address">No tengo dirección normal ni dirección permanente</string>
+    <string name="error_no_address">Completa registro mediante formulario en papel</string>
+    <string name="zip_code_error">código postal no válido</string>
+
+    <!--Register Fragment Strings-->
+    <string name="fragment_title_additional_info">Personal</string>
+    <string name="fragment_title_assistant_info">Asistencia</string>
+    <string name="section_label_gender">Sexo</string>
+    <string name="section_label_race">Raza</string>
+    <string name="section_label_party">Partido Político</string>
+    <string name="section_label_verification">La Verificación</string>
+    <string name="label_male">Masculino</string>
+    <string name="label_female">Femenino</string>
+    <string name="signature_description">Firme aquí</string>
+    <string name="label_button_register">Registrar</string>
+    <string name="label_agreement_prefix">He leido la \u0020</string>
+    <string name="label_agreement_link">Voter Registration Agreement</string>
+    <string name="agreement_neutral_button">Terminado</string>
+    <string name="voter_registration_agreement_title">Inscripción de Votantes Acuerdo</string>
+
+    <!--Additional Info Strings-->
+    <string name="label_preferred_language">Idioma de Preferencia</string>
+    <string name="label_drivers_license_id">Número de Licencia de Conducir de PA</string>
+    <string name="label_other_party">Otro Partido Político</string>
+    <string name="label_does_not_have_penn_dot">No sé mi número de PennDOT</string>
+    <string name="label_ssn_last_four">Los últimos 4 dígitos de su número de seguro social</string>
+    <string name="label_does_not_have_ssn">No sé mi número de los últimos 4 dígitos de su número de seguro social</string>
+    <string name="preferred_language_label">Idioma preferido para recibir los materiales electorales</string>
+    <string name="section_label_election_info">Información de las Elecciones</string>
+    <string name="penn_dot_enforcer_text">Ingrese el número de licencia de conducir de PA o de identificación PennDOT, los últimos cuatro dígitos de su número de seguro social.</string>
+    <string name="error_penn_dot">Marque \"no sé\" si no sabes su de identificación PennDOT</string>
+    <string name="ssn_enforcer_text">Si no cuenta con un número PennDOT, ingrese los últimos 4 dígitos de su número de seguro social. </string>
+    <string name="error_ssn">Marque \"no sé\" si no sabes los últimos cuatro dígitos de su número de seguro social.</string>
+    <string name="label_has_assistant">¿Alguien se ayudó con este formulario?</string>
+    <string name="section_label_assistant_name">Ayudante Nombre</string>
+    <string name="section_label_assistant_address">Ayudante Dirección</string>
+    <string name="section_label_assistant_contact_info">Información de Contacto de Ayudante</string>
+    <string name="phone_format_error">El número de teléfono que ingresó no es válido.</string>
+    <string name="label_email">Dirección de Email</string>
+    <string name="label_phone">Número de Teléfono</string>
+    <string name="label_phone_type">Tipo</string>
+    <string name="label_receive_email">"Doy permiso a %s para enviarme noticias y actualizaciones</string>
+    <string name="preferred_language_default">Español</string>
+    <string name="label_email_confirmation">
+        Enviar correo electrónico para permitir que Departamento de Estado de Pennsylvania le enviará un mensaje confirmando la recepción de su solicitud de registro de votante:
+    \n
+    \n
+    \u2022 Por favor tenga en cuenta que este correo electrónico puede tardar hasta 24 horas en llegar a usted."
+    </string>
+    <string name="label_assistant_declaration">
+        Si usted ayudó a un votante a llenar esta solicitud de inscripción de votante, también debe firmar la solicitud.  Marcar la casilla significa que usted está firmando electrónicamente la solicitud.
+\n
+\n
+Al hacerlo:
+\n
+\n
+\u2022 Afirma que entiende que su firma electrónica en esta solicitud constituye el equivalente legal de su firma.
+\n
+\n
+\u2022 Afirma que acepta firmar esta solicitud a través de medios electrónicos y que se aplicarán todas las leyes del estado Pennsylvania.
+    </string>
+    <string name="label_assistant_confirmation">CONFIRMO QUE LEÍ Y QUE ACEPTO LOS TÉRMINOS ANTERIORES.</string>
+
+    <!--Review and Confirm Fragment Strings-->
+    <string name="fragment_title_review">Revisar</string>
+    <string name="voter_agreement_text">He revisado la información anterior, y es verdad y exacta a lo mejor de mi conocimiento.</string>
+    <string name="title_activity_settings">La Configuración</string>
+    <string name="name_phrase_formatter">{title} {first_name} {middle_name} {last_name} {suffix}</string>
+    <string name="section_label_contact_info">Información de Contacto</string>
+    <string name="review_confirm_instructions">Por favor revise la siguiente información y confirmar su exactitud.</string>
+    <string name="section_label_signature">Su Firma</string>
+    <string name="signature_instructions">Por favor, use la lapicera electrónica para la captura de firmas</string>
+    <string name="signature_pad_error">Firma es necesaria</string>
+    <string name="action_cancel_reg">Cancelar la Inscripción</string>
+    <string name="registration_complete">Su inscripción estará completa</string>
+    <string name="disclosure_agreement_title">Declaración / Sancaón</string>
+    <string name="registration_complete_dialog_text">
+\n
+\u2022 Su solicitud se ha enviado a la oficina de registro de votantes del condado.
+\n
+\n
+\u2022 Su inscripción no estará completa hasta que sea procesada y aceptada por la oficina de inscripción de su condado.
+\n
+\n
+\u2022 Si acepta, recibirá su Tarjeta de Inscripción de Votante por correo.
+\n
+\n
+\u2022 Si en 14 días no ha recibido su Tarjeta de Inscripción de Votante, llame a su oficina de inscripción de votantes.
+\n
+\n
+Atención: La fecha límite para inscribirse y poder votar en las próximas elecciones 10/11/2016 es 11/8/2016.
+    </string>
+    <string name="disclosure_agreement">
+<![CDATA[
+
+<p>
+Declaro que
+</p>
+<ol >
+<li>
+Soy ciudadano de los Estados Unidos y habré sido ciudadano por lo menos 1 mes antes de la fecha de las siguientes elecciones.
+</li>
+<li>
+Tendré por lo menos 18 años en la fecha de las siguientes elecciones.
+</li>
+<li>
+Habré vivido en este dirección al menos durante 30 días antes de las próximas elecciones.
+</li>
+<li>
+Cumplo con los requisitos legales para votar.
+</li>
+</ol >
+<p>
+Lo declarado anteriormente es verdadero. Entiendo que esta declaración es una declaración jurada y si la información no es verdadera seré acusado(a) de perjurio y sentenciado(a) a prisión durante 7 años o a pagar una multa máxima de $15,000, o ambos.
+
+Marcar la casilla de abajo significa que usted está firmando la solicitud electrónicamente. Al hacerlo:
+<p>
+<ol>
+<li>
+Afirma que leyó y que acepta los términos de la declaración anterior.
+</li>
+<li>
+Afirma que entiende que su firma electrónica en esta solicitud constituye el equivalente legal de su firma para esta solicitud de inscripción de votante.
+</li>
+<li>
+Afirma que acepta hacer la transacción de la inscripción de votante a través de medios electrónicos y que entiende que todas las leyes de Pennsylvania se aplicarán a esta transacción.
+</li>
+</ol>
+<p>
+Si proporcionó su número de licencia de conducir de PA o de identificación de PennDOT, afirma que entiende que la firma que figura en su registro PennDOT constituirá su firma en el registro de inscripción de votante. Si usted sube una imagen de su firma, comprende que la firma que sube representará su firma en su archivo de inscripción de elector. Afirma que entiende que no es obligatorio inscribirse electrónicamente y que puede usar un formulario impreso o no electrónico para su solicitud de inscripción como votante.
+</p>
+<p>
+SANCIÓN POR DECLARACIÓN FALSA
+</p>
+<p>
+Advertencia: si una persona firma una solicitud de inscripción oficial sabiendo que algo de lo que declaró en la solicitud es falso, hace una inscripción falsa o proporciona información falsa, esa persona comete perjurio. Si se comprueba que cometió delito de perjurio será castigado con prisión máxima de siete años, o una multa máxima de $15,000, o ambos, a discreción del tribunal.
+</p>
+<p>
+Presentar una solicitud con datos falsos también puede estar sujeto a otras sanciones, incluso pérdida del derecho al voto según las leyes estatales o federales.
+</p>
+]]>
+    </string>
+
+
+    <!--Multi use strings-->
+    <string name="action_ok">Okay</string>
+    <string name="action_accept">Aceptar</string>
+    <string name="action_decline">Rechazar</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/open_source_licenses.xml b/app/src/main/res/values/open_source_licenses.xml
index 87149210..c84a68cb 100644
--- a/app/src/main/res/values/open_source_licenses.xml
+++ b/app/src/main/res/values/open_source_licenses.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="label_open_source_licenses">Open Source Licenses</string>
 
-    <string name="square_license">
+    <string name="square_license" translatable="false">
 Copyright 2013 Square, Inc.\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -18,7 +18,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="butter_knife_license">
+    <string name="butter_knife_license" translatable="false">
 Copyright 2013 Jake Wharton\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -34,7 +34,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="auto_value_license">
+    <string name="auto_value_license" translatable="false">
 Copyright 2013 Google, Inc.\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -50,7 +50,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="sqlbrite_license">
+    <string name="sqlbrite_license" translatable="false">
 Copyright 2015 Square, Inc.\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -66,7 +66,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="rxbinding_license">
+    <string name="rxbinding_license" translatable="false">
 Copyright © 2015 Jake Wharton\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -82,7 +82,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="signature_pad_license">
+    <string name="signature_pad_license" translatable="false">
 Copyright 2014-2016 Gianluca Cacace\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -98,7 +98,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="rx_java_license">
+    <string name="rx_java_license" translatable="false">
 Copyright 2013 Netflix, Inc.\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -114,7 +114,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="reactive_location_license">
+    <string name="reactive_location_license" translatable="false">
 Copyright © 2015 Michał Charmas (http://blog.charmas.pl)\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -130,7 +130,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="rx_preferences_license">
+    <string name="rx_preferences_license" translatable="false">
 Copyright 2014 Prateek Srivastava\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
@@ -146,7 +146,7 @@ See the License for the specific language governing permissions and\n
 limitations under the License.\n
     </string>
 
-    <string name="saripaar_license">
+    <string name="saripaar_license" translatable="false">
 Copyright 2012 - 2015 Mobs &amp; Geeks\n
 \n
 Licensed under the Apache License, Version 2.0 (the "License");\n
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85640c4a..0b6513a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
-    <string name="app_name">PA OVR APP</string>
+    <string name="app_name" translatable="false">PA OVR APP</string>
 
-    <string name="no_intent_handler">
+    <string name="no_intent_handler" translatable="false">
         There are no applications available to handle this action.
     </string>
 
@@ -9,20 +9,20 @@
     <string name="navigation_label_next">next</string>
 
     <!--Nav Drawer Strings-->
-    <string name="nav_title_home">Home</string>
-    <string name="nav_title_about">About</string>
-    <string name="nav_title_data_usage">Data Usage</string>
-    <string name="nav_title_help">Help</string>
+    <string name="nav_title_home" translatable="false">Home</string>
+    <string name="nav_title_about" translatable="false">About</string>
+    <string name="nav_title_data_usage" translatable="false">Data Usage</string>
+    <string name="nav_title_help" translatable="false">Help</string>
     <string name="incomplete_profile_alert">Some of your canvasser information is incomplete. You must enter your name, Partner ID, Event ID and Event Zip before registering voters</string>
     <string name="dialog_no_thanks">No Thanks</string>
     <string name="dialog_enter_info">Enter Info</string>
 
     <!--Main Activity Strings-->
-    <string name="label_total_registered">Total Registered</string>
+    <string name="label_total_registered" translatable="false">Total Registered</string>
     <string name="label_registered_event">Registered</string>
-    <string name="button_label_new_voter">New Voter</string>
-    <string name="event_details">Event Details</string>
-    <string name="error_partner_id">Invalid Partner ID</string>
+    <string name="button_label_new_voter" translatable="false">New Voter</string>
+    <string name="event_details" translatable="false">Event Details</string>
+    <string name="error_partner_id" translatable="false">Invalid Partner ID</string>
     <string name="label_partner_name_spinner">Validating Partner ID</string>
 
     <!--Registration Activity Strings-->
@@ -65,11 +65,10 @@
     <string name="label_city">City</string>
     <string name="label_zip_code">Zip Code</string>
     <string name="label_state">State</string>
-    <string name="label_unit_num">Unit #</string>
+    <string name="label_unit_num" translatable="false">Unit #</string>
     <string name="label_county">County</string>
     <string name="checkbox_mailing_address_is_different"> I get my mail from a different address from the one above</string>
     <string name="checkbox_address_changed">I have changed my address</string>
-    <string name="label_send_copy_in_mail">I would like to receive a copy of my voter registration in the mail</string>
     <string name="checkbox_name_changed">I have changed my name</string>
     <string name="label_receive_text">I agree that %s/Pennsylvania Voice/State Voices may call and text me with important updates and reminders</string>
     <string name="county_empty_error">County Required</string>
@@ -141,7 +140,6 @@ In doing so:
     <string name="fragment_title_review">Review</string>
     <string name="voter_agreement_text">I have reviewed the above information, and it is true and accurate to the best of my knowledge.</string>
     <string name="title_activity_settings">Settings</string>
-    <string name="name_phrase_formatter">{title} {first_name} {middle_name} {last_name} {suffix}</string>
     <string name="section_label_contact_info">Contact Info</string>
     <string name="review_confirm_instructions">Please review the following information and confirm its accuracy.</string>
     <string name="section_label_signature">Signature</string>
@@ -180,7 +178,7 @@ I am a United States citizen and will have been a citizen for at least 1 month o
 I will be at least 18 years old on the day of the next election.
 </li>
 <li>
-I will have lived at the address in section 5 for at least 30 days before the election.
+I will have lived at this address for at least 30 days before the election.
 </li>
 <li>
 I am legally qualified to vote.
@@ -218,35 +216,34 @@ Submitting an application containing false information may also subject a person
     </string>
 
     <!-- Preference Strings -->
-    <string name="pref_key_partner_id">partner_id</string>
-    <string name="pref_key_partner_name">partner_name</string>
-    <string name="pref_key_canvasser_name">canvasser_name</string>
-    <string name="pref_key_event_zip_code">event_zip</string>
-    <string name="pref_key_event_name">event_name</string>
-    <string name="pref_key_event_reg_total">event_reg_total</string>
-    <string name="pref_key_app_reg_total">app_reg_total</string>
+    <string name="pref_key_partner_id" translatable="false">partner_id</string>
+    <string name="pref_key_partner_name" translatable="false">partner_name</string>
+    <string name="pref_key_canvasser_name" translatable="false">canvasser_name</string>
+    <string name="pref_key_event_zip_code" translatable="false">event_zip</string>
+    <string name="pref_key_event_name" translatable="false">event_name</string>
+    <string name="pref_key_event_reg_total" translatable="false">event_reg_total</string>
+    <string name="pref_key_app_reg_total" translatable="false">app_reg_total</string>
 
-    <string name="pref_title_partner_name">Partner Name</string>
-    <string name="pref_title_partner_id">Partner ID</string>
-    <string name="pref_title_canvaser_name">Canvaser Name</string>
-    <string name="pref_title_event_zip_code">Event Zip Code</string>
-    <string name="pref_title_event_name">Event Name</string>
+    <string name="pref_title_partner_name" translatable="false">Partner Name</string>
+    <string name="pref_title_partner_id" translatable="false">Partner ID</string>
+    <string name="pref_title_canvaser_name" translatable="false">Canvaser Name</string>
+    <string name="pref_title_event_zip_code" translatable="false">Event Zip Code</string>
+    <string name="pref_title_event_name" translatable="false">Event Name</string>
 
     <!--Multi use strings-->
     <string name="action_cancel">Cancel</string>
     <string name="action_save">Save</string>
-    <string name="action_edit">Edit</string>
     <string name="action_ok">OK</string>
     <string name="action_accept">Accept</string>
     <string name="action_decline">Decline</string>
 
-    <string name="upload_notification_title_success">PA Registration Success</string>
-    <string name="upload_notification_title_failure">PA Registration Failed</string>
-    <string name="upload_notification_content_success">Registration submitted</string>
-    <string name="upload_notification_content_client_failure">Bad registration data</string>
-    <string name="upload_notification_content_connection_failure">Unable to contact server</string>
+    <string name="upload_notification_title_success" translatable="false">PA Registration Success</string>
+    <string name="upload_notification_title_failure" translatable="false">PA Registration Failed</string>
+    <string name="upload_notification_content_success" translatable="false">Registration submitted</string>
+    <string name="upload_notification_content_client_failure" translatable="false">Bad registration data</string>
+    <string name="upload_notification_content_connection_failure" translatable="false">Unable to contact server</string>
 
-    <string name="about_activity_text">
+    <string name="about_activity_text" translatable="false">
 <![CDATA[
 
 <p>
@@ -279,7 +276,7 @@ outcomes.
 ]]>
     </string>
 
-     <string name="data_usage_activity_text">
+     <string name="data_usage_activity_text" translatable="false">
 <![CDATA[
 
 <p>
@@ -322,7 +319,7 @@ ensure its security on our systems.
 ]]>
     </string>
 
-    <string name="help_activity_text">
+    <string name="help_activity_text" translatable="false">
 <![CDATA[
 <p>
 &nbsp&nbsp&nbsp&nbsp If you have any questions about this app or its data usage policy please contact