From edbeb09f21461e6433f3bb234c7d2753f3993f36 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Fri, 6 Sep 2013 17:01:19 +0100
Subject: [PATCH] Add support for the NVDA voice variants.

---
 android/res/values/donottranslate.xml         | 30 ++++++++++++++++++
 .../espeak/VoiceVariantPreference.java        | 31 +++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 75d1f9fc..8f7ce2a9 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -8,5 +8,35 @@
 
   <!-- Voice Variants that are people's names. -->
   <string name="variant_klatt">Klatt</string>
+  <string name="variant_nvda">NVDA</string>
+  <string name="variant_andy">Andy</string>
+  <string name="variant_annie">Annie</string>
+  <string name="variant_anxious_andy">Anxious Andy</string>
+  <string name="variant_aunty">Aunty</string>
+  <string name="variant_boris">Boris</string>
+  <string name="variant_denis">Denis</string>
+  <string name="variant_gene">Gene</string>
+  <string name="variant_gene2">Gene 2</string>
+  <string name="variant_iven">Iven</string>
+  <string name="variant_iven2">Iven 2</string>
+  <string name="variant_iven3">Iven 3</string>
+  <string name="variant_jacky">Jacky</string>
+  <string name="variant_john">John</string>
+  <string name="variant_kaukovalta">Kaukovalta</string>
+  <string name="variant_lee">Lee</string>
+  <string name="variant_linda">Linda</string>
+  <string name="variant_mario">Mario</string>
+  <string name="variant_max">Max</string>
+  <string name="variant_michael">Michael</string>
+  <string name="variant_michel">Michel</string>
+  <string name="variant_mr_serious">Mr Serious</string>
+  <string name="variant_norbert">Norbert</string>
+  <string name="variant_quincy">Quincy</string>
+  <string name="variant_rob">Rob</string>
+  <string name="variant_robert">Robert</string>
+  <string name="variant_storm">Storm</string>
+  <string name="variant_travis">Travis</string>
+  <string name="variant_tweaky">Tweaky</string>
+  <string name="variant_zac">Zac</string>
 
 </resources>
\ No newline at end of file
diff --git a/android/src/com/reecedunn/espeak/VoiceVariantPreference.java b/android/src/com/reecedunn/espeak/VoiceVariantPreference.java
index 93f5d45e..64f8f861 100644
--- a/android/src/com/reecedunn/espeak/VoiceVariantPreference.java
+++ b/android/src/com/reecedunn/espeak/VoiceVariantPreference.java
@@ -117,6 +117,7 @@ public class VoiceVariantPreference extends DialogPreference {
         R.string.variant_male,
         R.string.variant_female,
         R.string.variant_klatt,
+        R.string.variant_nvda,
         R.string.variant_young,
         R.string.variant_old,
         R.string.variant_croak,
@@ -145,6 +146,36 @@ public class VoiceVariantPreference extends DialogPreference {
             new VariantData(R.string.variant_n, 2, "klatt2"),
             new VariantData(R.string.variant_n, 3, "klatt3"),
             new VariantData(R.string.variant_n, 4, "klatt4"),
+        },{ // NVDA
+            new VariantData(R.string.variant_andy, "Andy"),
+            new VariantData(R.string.variant_annie, "Annie"),
+            new VariantData(R.string.variant_anxious_andy, "AnxiousAndy"),
+            new VariantData(R.string.variant_aunty, "aunty"),
+            new VariantData(R.string.variant_boris, "boris"),
+            new VariantData(R.string.variant_denis, "Denis"),
+            new VariantData(R.string.variant_gene, "Gene"),
+            new VariantData(R.string.variant_gene2, "Gene2"),
+            new VariantData(R.string.variant_iven, "iven"),
+            new VariantData(R.string.variant_iven2, "iven2"),
+            new VariantData(R.string.variant_iven3, "iven3"),
+            new VariantData(R.string.variant_jacky, "Jacky"),
+            new VariantData(R.string.variant_john, "john"),
+            new VariantData(R.string.variant_kaukovalta, "kaukovalta"),
+            new VariantData(R.string.variant_lee, "Lee"),
+            new VariantData(R.string.variant_linda, "linda"),
+            new VariantData(R.string.variant_mario, "Mario"),
+            new VariantData(R.string.variant_max, "max"),
+            new VariantData(R.string.variant_michael, "Michael"),
+            new VariantData(R.string.variant_michel, "michel"),
+            new VariantData(R.string.variant_mr_serious, "Mr serious"),
+            new VariantData(R.string.variant_norbert, "norbert"),
+            new VariantData(R.string.variant_quincy, "quincy"),
+            new VariantData(R.string.variant_rob, "rob"),
+            new VariantData(R.string.variant_robert, "robert"),
+            new VariantData(R.string.variant_storm, "Storm"),
+            new VariantData(R.string.variant_travis, "travis"),
+            new VariantData(R.string.variant_tweaky, "Tweaky"),
+            new VariantData(R.string.variant_zac, "zac"),
         },{ // Young
             new VariantData(R.string.variant_male, "male-young"),
             new VariantData(R.string.variant_female, "female-young"),