1.1 --- a/data/dictionary.xml	Mon Aug 12 22:40:38 2013 +0200
     1.2 +++ b/data/dictionary.xml	Mon Aug 12 22:44:21 2013 +0200
     1.3 @@ -274,10 +274,10 @@
     1.4  			<text>
     1.5  				a standardized language for describing e-mail filters;
     1.6  				the MDA can apply system-wide or user-defined filters on incoming messages;
     1.7 -				a filter has conditions (connected logical operators: AND, OR…) like „message header contains value X“
     1.8 -				and actions that will be done with the message like „file into folder X“ or „add flag/label 1“ or „redirect message to some.address@example.com“ or „discard message“;
     1.9 +				a filter has conditions (connected by logical operators: AND, OR…) like „message header contains value X“
    1.10 +				and actions that will be done with the message like „file into folder X“ or „add flag/label X“ or „redirect message to some.address@example.com“ or „discard message“;
    1.11  				filters are executed on the server where MDA resides,
    1.12 -				so they are independent on the MUA currently used by the user
    1.13 +				so they are independent of the MUA currently used by the user
    1.14  				and works even if the user is offline (useful for OOTO messages when the user is on vacation)
    1.15  			</text>
    1.16  		</explanation>

     2.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java	Mon Aug 12 22:40:38 2013 +0200
     2.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java	Mon Aug 12 22:44:21 2013 +0200
     2.3 @@ -18,7 +18,6 @@
     2.4  package cz.frantovo.telco.dictionary;
     2.5  
     2.6  import java.io.Closeable;
     2.7 -import java.io.IOException;
     2.8  import java.util.HashSet;
     2.9  import java.util.Iterator;
    2.10  import java.util.Map;

     3.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java	Mon Aug 12 22:40:38 2013 +0200
     3.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java	Mon Aug 12 22:44:21 2013 +0200
     3.3 @@ -54,7 +54,7 @@
     3.4  	}
     3.5  
     3.6  	@Override
     3.7 -	public Iterator getPrefixes(String xmlns) {
     3.8 +	public Iterator<String> getPrefixes(String xmlns) {
     3.9  		return getKeysForValue(prefixMap, xmlns).iterator();
    3.10  	}
    3.11  }
    3.12 \ No newline at end of file