Merge branch 'master' of github.com:mideind/Tokenizer

Author: vthorsteinsson

src/tokenizer/Abbrev.conf

@@ -531,6 +531,7 @@ innh.* = "innheimta" kvk
 innsk. = "innskot" hk
 jap.* = "japanska" kvk
 jap.* = "japanskur" lo
+jr. = "yngri" erl		# junior
 kan.* = "kanadískur" lo	
 kaþ.* = "kaþólskur" lo
 keltn.* = "keltneska" kvk
@@ -719,6 +720,7 @@ Spánv.* = "Spánverji" kk
 spæ.* = "spænska" kvk
 spæ.* = "spænskur" lo
 sr. = "séra" kk
+sr. = "eldri" erl		# senior
 ss.* = "samsettur" lo
 st.* = "samtenging" kvk
 st.* = "stig" hk

src/tokenizer/abbrev.py

@@ -258,6 +258,8 @@ def has_abbreviation(meaning):
     def get_meaning(abbrev):
         """ Lookup meaning(s) of abbreviation, if available. """
         m = Abbreviations.DICT.get(abbrev)
+        if not m:
+            m = Abbreviations.WRONGDICT.get(abbrev)
         return list(m) if m else None
 
     @staticmethod