am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main dictionary" into jb-dev

* commit '501528218da3b3043eab83201928518bf7cdc2ce':
  Make sure whitelist targets are in the main dictionary

4 files changed, 24 insertions, 3 deletions

diff --git a/dictionaries/en_gb_wordlist.xml b/dictionaries/en_gb_wordlist.xml
index fe4081b95..c2af46e1d 100644
--- a/dictionaries/en_gb_wordlist.xml
+++ b/dictionaries/en_gb_wordlist.xml
@@ -1,4 +1,4 @@
-<wordlist locale="en_GB" description="English (UK)" date="1339787870" version="15">
+<wordlist locale="en_GB" description="English (UK)" date="1340038724" version="16">
  <w f="222" flags="">the</w>
  <w f="214" flags="">of</w>
  <w f="212" flags="">and</w>
@@ -11907,6 +11907,7 @@
  <w f="100" flags="">helmets</w>
  <w f="100" flags="">heyday</w>
  <w f="100" flags="">highlighting</w>
+ <w f="100">how've</w>
  <w f="100" flags="">hugely</w>
  <w f="100" flags="">iPhone</w>
  <w f="100" flags="">identifiable</w>
@@ -19290,6 +19291,8 @@
  <w f="90" flags="">weir</w>
  <w f="90">well-being</w>
  <w f="90" flags="">wettest</w>
+ <w f="90">when's</w>
+ <w f="90">where'll</w>
  <w f="90" flags="">whipped</w>
  <w f="90" flags="">widowers</w>
  <w f="90" flags="">winner's</w>
@@ -87399,6 +87402,7 @@
  <w f="40" flags="">housemother</w>
  <w f="40" flags="">houseware</w>
  <w f="40" flags="">housewife's</w>
+ <w f="40">how'll</w>
  <w f="40" flags="">hucksters</w>
  <w f="40" flags="">humanise</w>
  <w f="40" flags="">humbles</w>
@@ -134707,6 +134711,7 @@
  <w f="10" flags="">wettish</w>
  <w f="10" flags="">whammies</w>
  <w f="10" flags="nonword">what'd</w>
+ <w f="10">what'm</w>
  <w f="10" flags="">wheaties</w>
  <w f="10" flags="">wheelbarrow's</w>
  <w f="10" flags="">wheezers</w>
@@ -134729,6 +134734,7 @@
  <w f="10" flags="">whoas</w>
  <w f="10" flags="">whoopers</w>
  <w f="10" flags="">whopped</w>
+ <w f="10">why'll</w>
  <w f="10" flags="">widgeons</w>
  <w f="10" flags="">widgie</w>
  <w f="10" flags="">wikipedias</w>
@@ -156771,6 +156777,7 @@
  <w f="0" flags="medical">virginity</w>
  <w f="0">virginity's</w>
  <w f="0" flags="babytalk">virgins</w>
+ <w f="0">vis</w>
  <w f="0" flags="">voyeur</w>
  <w f="0" flags="n">voyeurism</w>
  <w f="0" flags="n">voyeurs</w>
diff --git a/dictionaries/en_us_wordlist.xml b/dictionaries/en_us_wordlist.xml
index 4ceba5b37..3cafbd786 100644
--- a/dictionaries/en_us_wordlist.xml
+++ b/dictionaries/en_us_wordlist.xml
@@ -1,4 +1,4 @@
-<wordlist locale="en_US" description="English (US)" date="1339787839" version="15">
+<wordlist locale="en_US" description="English (US)" date="1340038693" version="16">
  <w f="222" flags="">the</w>
  <w f="214" flags="">of</w>
  <w f="212" flags="">and</w>
@@ -12307,6 +12307,7 @@
  <w f="100" flags="">heyday</w>
  <w f="100" flags="">highlighting</w>
  <w f="100" flags="">hospitalized</w>
+ <w f="100">how've</w>
  <w f="100" flags="">hugely</w>
  <w f="100" flags="">iPhone</w>
  <w f="100" flags="">identifiable</w>
@@ -20036,6 +20037,8 @@
  <w f="90" flags="">weir</w>
  <w f="90">well-being</w>
  <w f="90" flags="">wettest</w>
+ <w f="90">when's</w>
+ <w f="90">where'll</w>
  <w f="90" flags="">whipped</w>
  <w f="90" flags="">widowers</w>
  <w f="90" flags="">winner's</w>
@@ -90336,6 +90339,7 @@
  <w f="40" flags="">housemother</w>
  <w f="40" flags="">houseware</w>
  <w f="40" flags="">housewife's</w>
+ <w f="40">how'll</w>
  <w f="40" flags="">hucksters</w>
  <w f="40" flags="">humbles</w>
  <w f="40" flags="">hurling's</w>
@@ -138233,6 +138237,7 @@
  <w f="10" flags="">wettish</w>
  <w f="10" flags="">whammies</w>
  <w f="10" flags="nonword">what'd</w>
+ <w f="10">what'm</w>
  <w f="10" flags="">wheelbarrow's</w>
  <w f="10" flags="">wheezers</w>
  <w f="10" flags="">whelm</w>
@@ -138254,6 +138259,7 @@
  <w f="10" flags="">whoas</w>
  <w f="10" flags="">whoopers</w>
  <w f="10" flags="">whopped</w>
+ <w f="10">why'll</w>
  <w f="10" flags="">widgeons</w>
  <w f="10" flags="">widgie</w>
  <w f="10" flags="">wight's</w>
@@ -160529,6 +160535,7 @@
  <w f="0" flags="medical">virginity</w>
  <w f="0">virginity's</w>
  <w f="0" flags="babytalk">virgins</w>
+ <w f="0">vis</w>
  <w f="0" flags="">voyeur</w>
  <w f="0" flags="n">voyeurism</w>
  <w f="0" flags="n">voyeurs</w>
diff --git a/dictionaries/en_wordlist.xml b/dictionaries/en_wordlist.xml
index 6b3ab3156..6f594d5a4 100644
--- a/dictionaries/en_wordlist.xml
+++ b/dictionaries/en_wordlist.xml
@@ -1,4 +1,4 @@
-<wordlist locale="en" description="English" date="1339788037" version="15">
+<wordlist locale="en" description="English" date="1340038727" version="16">
  <w f="222" flags="">the</w>
  <w f="214" flags="">of</w>
  <w f="212" flags="">and</w>
@@ -12401,6 +12401,7 @@
  <w f="100" flags="">heyday</w>
  <w f="100" flags="">highlighting</w>
  <w f="100" flags="">hospitalized</w>
+ <w f="100">how've</w>
  <w f="100" flags="">hugely</w>
  <w f="100" flags="">iPhone</w>
  <w f="100" flags="">identifiable</w>
@@ -20230,6 +20231,8 @@
  <w f="90" flags="">weir</w>
  <w f="90">well-being</w>
  <w f="90" flags="">wettest</w>
+ <w f="90">when's</w>
+ <w f="90">where'll</w>
  <w f="90" flags="">whipped</w>
  <w f="90" flags="">widowers</w>
  <w f="90" flags="">winner's</w>
@@ -92316,6 +92319,7 @@
  <w f="40" flags="">housemother</w>
  <w f="40" flags="">houseware</w>
  <w f="40" flags="">housewife's</w>
+ <w f="40">how'll</w>
  <w f="40" flags="">hucksters</w>
  <w f="40" flags="">humanise</w>
  <w f="40" flags="">humbles</w>
@@ -142321,6 +142325,7 @@
  <w f="10" flags="">wettish</w>
  <w f="10" flags="">whammies</w>
  <w f="10" flags="nonword">what'd</w>
+ <w f="10">what'm</w>
  <w f="10" flags="">wheaties</w>
  <w f="10" flags="">wheelbarrow's</w>
  <w f="10" flags="">wheezers</w>
@@ -142343,6 +142348,7 @@
  <w f="10" flags="">whoas</w>
  <w f="10" flags="">whoopers</w>
  <w f="10" flags="">whopped</w>
+ <w f="10">why'll</w>
  <w f="10" flags="">widgeons</w>
  <w f="10" flags="">widgie</w>
  <w f="10" flags="">wight's</w>
@@ -165359,6 +165365,7 @@
  <w f="0" flags="medical">virginity</w>
  <w f="0">virginity's</w>
  <w f="0" flags="babytalk">virgins</w>
+ <w f="0">vis</w>
  <w f="0" flags="">voyeur</w>
  <w f="0" flags="n">voyeurism</w>
  <w f="0" flags="n">voyeurs</w>
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict
index c96276e04..98a9361b5 100644
--- a/java/res/raw/main_en.dict
+++ b/java/res/raw/main_en.dict