From 401e70535e2b9bb1dd3fc0f35f5bc65d914a5be8 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Tue, 19 Jun 2012 02:08:57 +0900
Subject: [PATCH] Make sure whitelist targets are in the main dictionary

Bug: 6680976
Change-Id: Ieddb5eecb813da3a8a515930568e356bc3526386
---
 dictionaries/en_gb_wordlist.xml |   9 ++++++++-
 dictionaries/en_us_wordlist.xml |   9 ++++++++-
 dictionaries/en_wordlist.xml    |   9 ++++++++-
 java/res/raw/main_en.dict       | Bin 1068787 -> 1068816 bytes
 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 c96276e04693b32a68377617105ec9483623dc93..98a9361b586582d61e3446e509023902a15bb340 100644
GIT binary patch
delta 597
zcmW;JTSyd97zglX*L8Ph)j3eQEf|MbVGGMWX08#4BdA%a3`uzjbhVvwbZ*U=-EDlZ
zfyBjxI9*_0GLn3ZT#6XzLgz8bqQ|Hpun2lB2<xe{J^UWN@8$npeyw(sd)=gU_fdq}
zj&&UAfO*Bns%gO1^v#})%o3gDfA67lLY+c2;b05Zg@q(FqKVtojLzMlR`gklUar}Y
zs9p2Yq`1~TOP#tG&uLDS!!$3xxk?M-&LesSbiSf4=vt-o;6#vag25sB0}N)b4Rgg|
zt|Gt$nJOm4R5M{F;tzBD_t3uUWvosakQ*r?$FX36<oZWEuQ2(}b0<Ig=feD-PHx1P
zd-*SWo0}yiZK=+@V#D*tWv#DE#)+{I$eu!)1`i-xff(Q-$}2EilqYybV4_S7Q_Ix(
z@`Pv^AcJhv)FA|Tf#gm$FZu7c#8370iZs3EUEr{n4L&5wSk;PmDa4oPwpib^=xL#4
zpr?q@Uwyx9YH%RDS+>|DXCe=X-5YsA@GgI6Tm0D&zXSBRXSR<cONVLCmOgm7o@LMN
zdFu!NinkiY7EcXs5%Y26GjSJ%*QNCa@C_y{g}n&o6UZ<fcu2<WkZmSZHaiV;p|l<Y
zDX>PIj(|)GjRBXq1A%$}YYfbC)m12o;dp5%4wAihqf)X>n(9N-F2vHsQKTABm&|E|
z&Hn)j<e0EY%8jx!*-*6#sxt%IGb}5HSVOD?j{8sJU?a>2L6)o3f<Ln#tQ`IaM^(@(

delta 583
zcmW;JOK1~O7zJP^k0zO<nG0fLAmthoDbh-B2x;mfbOLRRwxPj*#THvrGq%%AX2y9W
zrf9j?miX9=ZnE)3UAjo@X22@mg@~e}YhAcd3NBR;6$Ecxe4DfQ&w<~%oBeSoYbEw2
zkETaQQ8Eqdf~Jd#3=^rF<DIjY$cpbLOR8*ej!5j`IH|E~{Y3W1t`Wsw-5{#}@gZ^{
z&>10G;Hg0LUTu;X!6%Q1$xZ(yb?&uE8r-i3<RZvyktP_!WEJFg$tzGukguR{Y`w&^
zO3WSy<)mDco9dxFl-DjXzFl`e?&@M$hRn=mWEd)JSZ02vjvEWladY9leahqeonZ=g
zal-fMKs3q=L#k-33L2b4MJbmm>al4jsGLBW0Ck|ZTC?*$ilzKifa;}!_Ut^T%3uL$
zic*6R=xdgFd~nnL@P_-izfj>9@8fffhAYm8mT=m29WS}PXxS8`GRz=RgcIGWC@;Y=
z_d1r`S3zyqlJh<Hx{3s+JTJQ{opaK=WoZ-MZLHhQ&)oOE@D)%CV<nYGY7LHHjemj7
z@dj>=@7TdV+^q;Vh(+f!OWF3mvzi<1PP@|wzC_}xK;H!G2a&88aHy!KA}&y2ktD&%
z_I3yigWHyocI2!^#GzQtDTiu*3xO4eakk50Fu=F{{6LZ~XVGF4>iqc<5@lH9l`}|J
s{vVDZLxFMLETO#`QEiCEGEB|Uju4^&XTJ@Dj>qKy6~^9-f*VKv0lZJlg8%>k