go

diff --git a/default.properties b/default.properties
deleted file mode 100644 (file)
index c1fd41ab161dea222fff980fb16659b6b2f7902a..0000000000000000000000000000000000000000
--- a/default.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-8

diff --git a/default.properties b/default.properties
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..82d8917be216021e727a80d7886e2dbb6b7fb8ed
--- /dev/null
+++ b/default.properties
@@ -0,0 +1 @@
+project.properties
\ No newline at end of file

diff --git a/images/americanFlag.jpg b/images/americanFlag.jpg
deleted file mode 100755 (executable)
index 8d85b25..0000000
Binary files a/images/americanFlag.jpg and /dev/null differ

diff --git a/images/as-lgflag.gif b/images/as-lgflag.gif
deleted file mode 100644 (file)
index 07cc33b..0000000
Binary files a/images/as-lgflag.gif and /dev/null differ

diff --git a/images/au-lgflag.gif b/images/au-lgflag.gif
deleted file mode 100644 (file)
index ff3e618..0000000
Binary files a/images/au-lgflag.gif and /dev/null differ

diff --git a/images/be-lgflag.gif b/images/be-lgflag.gif
deleted file mode 100644 (file)
index bc57368..0000000
Binary files a/images/be-lgflag.gif and /dev/null differ

diff --git a/images/br-lgflag.gif b/images/br-lgflag.gif
deleted file mode 100644 (file)
index 940432b..0000000
Binary files a/images/br-lgflag.gif and /dev/null differ

diff --git a/images/ca-lgflag.gif b/images/ca-lgflag.gif
deleted file mode 100644 (file)
index efc4496..0000000
Binary files a/images/ca-lgflag.gif and /dev/null differ

diff --git a/images/ee-lgflag.gif b/images/ee-lgflag.gif
deleted file mode 100644 (file)
index 97c742b..0000000
Binary files a/images/ee-lgflag.gif and /dev/null differ

diff --git a/images/ei-lgflag.gif b/images/ei-lgflag.gif
deleted file mode 100644 (file)
index 68a9273..0000000
Binary files a/images/ei-lgflag.gif and /dev/null differ

diff --git a/images/flags.xcf b/images/flags.xcf
deleted file mode 100755 (executable)
index b322c28..0000000
Binary files a/images/flags.xcf and /dev/null differ

diff --git a/images/fr-lgflag.gif b/images/fr-lgflag.gif
deleted file mode 100644 (file)
index 9fa5027..0000000
Binary files a/images/fr-lgflag.gif and /dev/null differ

diff --git a/images/germanFlag.jpg b/images/germanFlag.jpg
deleted file mode 100755 (executable)
index b796c87..0000000
Binary files a/images/germanFlag.jpg and /dev/null differ

diff --git a/images/german_fuenf.png b/images/german_fuenf.png
deleted file mode 100644 (file)
index 24a7e1d..0000000
Binary files a/images/german_fuenf.png and /dev/null differ

diff --git a/images/gm-lgflag.gif b/images/gm-lgflag.gif
deleted file mode 100644 (file)
index ef82b20..0000000
Binary files a/images/gm-lgflag.gif and /dev/null differ

diff --git a/images/gr-lgflag.gif b/images/gr-lgflag.gif
deleted file mode 100644 (file)
index f8f35d0..0000000
Binary files a/images/gr-lgflag.gif and /dev/null differ

diff --git a/images/it-lgflag.gif b/images/it-lgflag.gif
deleted file mode 100644 (file)
index 18b6f03..0000000
Binary files a/images/it-lgflag.gif and /dev/null differ

diff --git a/images/ja-lgflag.gif b/images/ja-lgflag.gif
deleted file mode 100644 (file)
index af4419a..0000000
Binary files a/images/ja-lgflag.gif and /dev/null differ

diff --git a/images/mx-lgflag.gif b/images/mx-lgflag.gif
deleted file mode 100644 (file)
index 2569250..0000000
Binary files a/images/mx-lgflag.gif and /dev/null differ

diff --git a/images/nl-lgflag.gif b/images/nl-lgflag.gif
deleted file mode 100644 (file)
index e6fa805..0000000
Binary files a/images/nl-lgflag.gif and /dev/null differ

diff --git a/images/no-lgflag.gif b/images/no-lgflag.gif
deleted file mode 100644 (file)
index c29a5eb..0000000
Binary files a/images/no-lgflag.gif and /dev/null differ

diff --git a/images/po-lgflag.gif b/images/po-lgflag.gif
deleted file mode 100644 (file)
index e7a49d8..0000000
Binary files a/images/po-lgflag.gif and /dev/null differ

diff --git a/images/rs-lgflag.gif b/images/rs-lgflag.gif
deleted file mode 100644 (file)
index c958629..0000000
Binary files a/images/rs-lgflag.gif and /dev/null differ

diff --git a/images/sf-lgflag.gif b/images/sf-lgflag.gif
deleted file mode 100644 (file)
index 3750169..0000000
Binary files a/images/sf-lgflag.gif and /dev/null differ

diff --git a/images/sp-lgflag.gif b/images/sp-lgflag.gif
deleted file mode 100644 (file)
index 7cf2cb7..0000000
Binary files a/images/sp-lgflag.gif and /dev/null differ

diff --git a/images/sw-lgflag.gif b/images/sw-lgflag.gif
deleted file mode 100644 (file)
index 4fdb247..0000000
Binary files a/images/sw-lgflag.gif and /dev/null differ

diff --git a/images/sz-lgflag.gif b/images/sz-lgflag.gif
deleted file mode 100644 (file)
index 8184466..0000000
Binary files a/images/sz-lgflag.gif and /dev/null differ

diff --git a/images/ts-lgflag.gif b/images/ts-lgflag.gif
deleted file mode 100644 (file)
index ae0c7f9..0000000
Binary files a/images/ts-lgflag.gif and /dev/null differ

diff --git a/images/tw-lgflag.gif b/images/tw-lgflag.gif
deleted file mode 100644 (file)
index 4c9c400..0000000
Binary files a/images/tw-lgflag.gif and /dev/null differ

diff --git a/images/uk-lgflag.gif b/images/uk-lgflag.gif
deleted file mode 100644 (file)
index 17b15b7..0000000
Binary files a/images/uk-lgflag.gif and /dev/null differ

diff --git a/images/us-lgflag.gif b/images/us-lgflag.gif
deleted file mode 100644 (file)
index 7269199..0000000
Binary files a/images/us-lgflag.gif and /dev/null differ

diff --git a/images/wa-lgflag.gif b/images/wa-lgflag.gif
deleted file mode 100644 (file)
index 63a7799..0000000
Binary files a/images/wa-lgflag.gif and /dev/null differ

diff --git a/jars/buildICU4J.sh b/jars/buildICU4J.sh
index 954551e3bd06910692d5520c7ee2b683853e61b6..9a39309190e371adfd71699d47b7abb0ac854229 100755 (executable)
--- a/jars/buildICU4J.sh
+++ b/jars/buildICU4J.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-DIR=`dirname $0`/icu4j-4_2_1-src
+DIR=`dirname $0`/icu4j-4_8_1_1
 
 cd $DIR
 ant clean

diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index 2ffbebed7a2459055d3fd62bf895bcea92325607..0df2727242b38d014cce63772e407d3bd151fdae 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -21,29 +21,24 @@ public enum EntryTypeName {
 //  WIKTIONARY_MEANING_ONE_WORD(0),
 //  WIKTIONARY_TRANSLATION_ONE_WORD(0),
 
-  WIKTIONARY_TITLE_SINGLE(0),
-  WIKTIONARY_FORM_SINGLE(0),
+  WIKTIONARY_TITLE_SINGLE(0, true),
+  WIKTIONARY_FORM_SINGLE(0, true),
 
   NOUN(0),
   VERB(0),
   ADJ(0),
   ADV(0),
-  ONE_WORD(0),
-  MULTIROW_HEAD_ONE_WORD(0),
-  MULTIROW_TAIL_ONE_WORD(0),
+  ONE_WORD(0, true),
+  MULTIROW_HEAD_ONE_WORD(0, true),
+  MULTIROW_TAIL_ONE_WORD(0, true),
 
-  WIKTIONARY_TITLE_MULTI(0),
-  WIKTIONARY_FORM_MULTI(0),
+  WIKTIONARY_TITLE_MULTI(0, true),
+  WIKTIONARY_FORM_MULTI(0, true),
   WIKTIONARY_TRANSLATION_SENSE(0),
   WIKTIONARY_ENGLISH_DEF_WIKI_LINK(0),
   WIKTIONARY_ENGLISH_DEF_OTHER_LANG(0),
   WIKTIONARY_ENGLISH_DEF(0),
 
-//  WIKTIONARY_TITLE_MULTI_WORD(0),
-//  WIKTIONARY_PRONUNCIATION(0),
-//  WIKTIONARY_MEANING_MULTI_WORD(0),
-//  WIKTIONARY_FORM_OF(0),
-//  WIKTIONARY_EXAMPLE_HEADWORDS(0),
   TWO_WORDS(0),
   THREE_WORDS(0),
   FOUR_WORDS(0),
@@ -58,13 +53,19 @@ public enum EntryTypeName {
   BRACKETED(0),
   PARENTHESIZED(0),
   SEE_ALSO(0), 
-  WIKTIONARY_TRANSLITERATION(0),   
+  WIKTIONARY_TRANSLITERATION(0),
   ;
 
   final int nameResId;
+  final boolean overridesStopList;
   
   private EntryTypeName(final int nameResId) {
+    this(nameResId, false);
+  }
+
+  private EntryTypeName(final int nameResId, final boolean overridesStopList) {
     this.nameResId = nameResId;
+    this.overridesStopList = overridesStopList;
   }
 
 }