From 1a5e792d38009c463788fcee0a5ed43b96026f92 Mon Sep 17 00:00:00 2001
From: cdhigh <cdhigh@users.noreply.github.com>
Date: Sun, 9 Jun 2024 22:00:45 -0300
Subject: [PATCH] improve online dict

---
 .../lib/calibre/ebooks/mobi/writer8/toc.py    |   2 +-
 application/lib/calibre/web/feeds/news.py     |   4 +-
 application/lib/dictionary/__init__.py        |  14 +-
 application/lib/dictionary/dict_cc.py         |  10 +-
 application/lib/dictionary/dict_cn.py         |   4 +
 application/lib/dictionary/dict_org.py        |  12 +-
 application/lib/dictionary/merriam_webster.py |  54 +++
 application/lib/dictionary/pystardict.py      | 442 ++++++++++++++++++
 application/lib/dictionary/stardict.py        |  42 ++
 application/static/base.js                    |   4 +-
 application/static/reader.css                 |  52 ++-
 application/static/reader.js                  | 191 +++++---
 application/templates/adv_dict.html           |   6 +-
 application/templates/my.html                 |   2 +-
 application/templates/reader.html             |  22 +-
 application/templates/reader_404.html         |  10 +
 application/translations/messages.pot         | 379 +++++++++------
 .../tr_TR/LC_MESSAGES/messages.mo             | Bin 28836 -> 29594 bytes
 .../tr_TR/LC_MESSAGES/messages.po             | 389 ++++++++-------
 .../translations/zh/LC_MESSAGES/messages.mo   | Bin 27039 -> 27850 bytes
 .../translations/zh/LC_MESSAGES/messages.po   | 389 ++++++++-------
 application/view/adv.py                       |  25 +-
 application/view/reader.py                    |  66 ++-
 application/view/settings.py                  |  22 +-
 docker/Dockerfile                             |   3 +-
 docs/Chinese/README.md                        |   1 +
 docs/Chinese/deployment.md                    |  14 +
 docs/Chinese/reader.md                        |  33 +-
 docs/English/README.md                        |   1 +
 docs/English/deployment.md                    |  12 +
 docs/English/reader.md                        |  25 +-
 tools/run_flask.bat                           |   1 +
 tools/update_req.py                           |  27 +-
 33 files changed, 1650 insertions(+), 608 deletions(-)
 create mode 100644 application/lib/dictionary/merriam_webster.py
 create mode 100644 application/lib/dictionary/pystardict.py
 create mode 100644 application/lib/dictionary/stardict.py
diff --git a/application/lib/calibre/ebooks/mobi/writer8/toc.py b/application/lib/calibre/ebooks/mobi/writer8/toc.py
index 3ec2e57c..bd7f5eae 100644
--- a/application/lib/calibre/ebooks/mobi/writer8/toc.py
+++ b/application/lib/calibre/ebooks/mobi/writer8/toc.py
@@ -18,7 +18,7 @@
 <head>
   <title>{title}</title>
   <style type="text/css">
-  li {{ list-style-type: none }}
+  li {{ list-style-type: none; padding-bottom: 8px }}
   a {{ text-decoration: none }}
   a:hover {{ color: red }}
   {extra_css}
diff --git a/application/lib/calibre/web/feeds/news.py b/application/lib/calibre/web/feeds/news.py
index ae8752e3..36749718 100644
--- a/application/lib/calibre/web/feeds/news.py
+++ b/application/lib/calibre/web/feeds/news.py
@@ -91,6 +91,7 @@ def __init__(self):
         self.get_delay = None
         self.max_files = None
         self.keep_images = True
+        self.keep_svg = False
 
 
 #每篇文章的下载任务参数
@@ -994,7 +995,8 @@ def __init__(self, options, log, output_dir, fs, feed_index_start=0):
             'compress_news_images_max_size', 'compress_news_images_auto_size', 'scale_news_images', 'filter_regexps',
             'match_regexps', 'no_stylesheets', 'verbose', 'delay', 'timeout', 'recursions', 'encoding'):
             setattr(wOpts, attr, getattr(self, attr))
-
+            
+        wOpts.keep_svg = getattr(options, 'keep_svg')
         wOpts.postprocess_html = self._postprocess_html
         wOpts.preprocess_image = self.preprocess_image
         wOpts.preprocess_raw_html = self.preprocess_raw_html_
diff --git a/application/lib/dictionary/__init__.py b/application/lib/dictionary/__init__.py
index ca25a389..e16f5371 100644
--- a/application/lib/dictionary/__init__.py
+++ b/application/lib/dictionary/__init__.py
@@ -4,10 +4,18 @@
 from .dict_org import DictOrg
 from .dict_cn import DictCn
 from .dict_cc import DictCc
+from .stardict import StarDict
+from .merriam_webster import MerriamWebster
 
-all_dict_engines = {DictOrg.name: DictOrg, DictCn.name: DictCn, DictCc.name: DictCc}
+all_dict_engines = {DictOrg.name: DictOrg, DictCn.name: DictCn, DictCc.name: DictCc,
+    MerriamWebster.name: MerriamWebster, StarDict.name: StarDict}
 
 #创建一个词典实例
-def CreateDictInst(name, database, host=None):
-    klass = all_dict_engines.get(name, DictOrg)
+def CreateDictInst(engine, database, host=None):
+    klass = all_dict_engines.get(engine, DictOrg)
     return klass(database, host)
+
+#获取某个引擎某个数据库的显示名字
+def GetDictDisplayName(engine, database):
+    klass = all_dict_engines.get(engine, DictOrg)
+    return klass.databases.get(database, database)
diff --git a/application/lib/dictionary/dict_cc.py b/application/lib/dictionary/dict_cc.py
index 317f96d5..2960f607 100644
--- a/application/lib/dictionary/dict_cc.py
+++ b/application/lib/dictionary/dict_cc.py
@@ -75,18 +75,22 @@ def __init__(self, database='', host=None):
         if database not in self.databases:
             default_log.warning(f'Database "{database}" not exists, fallback to "english"')
             database = 'en'
-        self.destCode = database
+        self.database = database
         self.destLang = self.databases[database]
         self.host = 'dict.cc'
         self.opener = UrlOpener()
+
+    #返回当前使用的词典名字
+    def __repr__(self):
+        return f'dict.cc [{self.database}]'
         
     def definition(self, word, language=''):
         if language not in self.databases:
             default_log.info(f'Database "{language}" not exists, fallback to "english"')
             language = 'en'
-        if language == self.destCode:
+        if language == self.database:
             raise Exception(f'The source and destination languages cannot be the same: {language}.')
-        url = f"https://{language}{self.destCode}.dict.cc"
+        url = f"https://{language}{self.database}.dict.cc"
         resp = self.opener.open(url, data={"s": word.encode("utf-8")})
         if resp.status_code == 200:
             return self.parse_resp(resp.text)
diff --git a/application/lib/dictionary/dict_cn.py b/application/lib/dictionary/dict_cn.py
index 0e2686ec..c2424d46 100644
--- a/application/lib/dictionary/dict_cn.py
+++ b/application/lib/dictionary/dict_cn.py
@@ -13,6 +13,10 @@ def __init__(self, database='!', host=None):
         self.database = database
         self.host = 'https://dict.cn'
         self.opener = UrlOpener(host=self.host)
+    
+    #返回当前使用的词典名字
+    def __repr__(self):
+        return 'dict.cn [English-Chinese]'
         
     def definition(self, word, language=''):
         resp = self.opener.open(f'{self.host}/{word}')
diff --git a/application/lib/dictionary/dict_org.py b/application/lib/dictionary/dict_org.py
index f4f8502b..8855cfef 100644
--- a/application/lib/dictionary/dict_org.py
+++ b/application/lib/dictionary/dict_org.py
@@ -179,13 +179,17 @@ class DictOrg:
     #'*' - all result, '!' - only the first result, others - database name
     def __init__(self, database='!', host=None):
         if database not in self.databases:
-            default_log.warning('Database "{database}" not exists, fallback to "First match"')
+            default_log.warning(f'Database "{database}" not exists, fallback to "First match"')
             database = '!'
         self.database = database
         self.host = 'dict.org'
         self.con = Connection(self.host)
         self.db = Database(self.con, database)
 
+    #返回当前使用的词典名字
+    def __repr__(self):
+        return 'dict.org [{}]'.format(self.databases.get(self.database, ''))
+
     #查词，language - word的语种
     def definition(self, word, language=''):
         defs = self.db.define(word)
@@ -208,11 +212,11 @@ def convert_to_ipa(self, txt):
             txt = f'{start}/{phon}/{rest}'
 
         #音标符号
-        phonetic = {'[a^]': 'æ', '[e^]': 'ɛ', '[u^]': 'ʌ', '[.a]': 'ə', '[y^]': 'ɪ', '[i^]': 'iː',
-            '[oo^]': 'uː', '[~e]': 'ə', '[o^]': 'ɔ', '[=a]': 'eɪ', '[th]': 'θ', '[=e]': 'iː', '[=u]': 'juː',
+        phonetic = {'[a^]': 'æ', '[e^]': 'ɛ', '[u^]': 'ʌ', '[.a]': 'ə', '[y^]': 'ɪ', '[i^]': 'i',
+            '[oo^]': 'uː', '[~e]': 'ə', '[o^]': 'ɔ', '[=a]': 'eɪ', '[th]': 'ð', '[=e]': 'iː', '[=u]': 'juː',
             '[ng]': 'ŋ', '[aum]': 'ɔː', '[-o]': 'oʊ', "['e]": 'e', '[=o]': 'oʊ', '[^o]': 'ɔ',
             '[imac]': 'aɪ', '[-e]': 'iː', '[add]': 'ɔː', '[asl]': 'æ', '[^e]': 'ɪ', '[=ae]': 'eɪ',
-            '[ae]': 'eɪ', '[ˌo]': 'əʊ'}
+            '[ae]': 'æ', '[ˌo]': 'əʊ', '[-u]': 'u', '[thorn]': 'θ', '[eth]': 'ð'}
         
         pattern = re.compile('|'.join(re.escape(key) for key in phonetic.keys()))
         return pattern.sub(lambda x: phonetic[x.group()], txt)
diff --git a/application/lib/dictionary/merriam_webster.py b/application/lib/dictionary/merriam_webster.py
new file mode 100644
index 00000000..bc35907f
--- /dev/null
+++ b/application/lib/dictionary/merriam_webster.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+# -*- coding:utf-8 -*-
+#Merriam-Webster <https://www.merriam-webster.com/> 查词接口
+import re
+from bs4 import BeautifulSoup
+from urlopener import UrlOpener
+
+class MerriamWebster:
+    name = "webster's"
+    #词典列表，键为词典缩写，值为词典描述
+    databases = {"english": "Webster's New International Dictionary"}
+
+    def __init__(self, database='', host=None):
+        self.database = database
+        self.host = 'https://www.merriam-webster.com'
+        self.opener = UrlOpener(host=self.host)
+        self.pat1 = re.compile(br'<(head|script|style|svg|footer|header)\b[^<]*(?:(?!</\1>)<[^<]*)*</\1>', re.IGNORECASE)
+        self.pat2 = re.compile(br'[\s\r\n]+<')
+        self.pat3 = re.compile(br'>[\s\r\n]+')
+
+    #返回当前使用的词典名字
+    def __repr__(self):
+        return "webster's [English]"
+        
+    def definition(self, word, language=''):
+        resp = self.opener.open(f'{self.host}/dictionary/{word}')
+        if resp.status_code == 200:
+            #因为网页内容太庞杂，BeautifulSoup解释耗时太久，使用正则先去掉一些内容
+            #同时内容不太规范，如果直接使用lxml经常导致获取不到释义
+            content = re.sub(self.pat1, b'', resp.content)
+            content = re.sub(self.pat2, b'<', content)
+            content = re.sub(self.pat3, b'>', content)
+            soup = BeautifulSoup(content, 'lxml')
+            ret = []
+            phonetic = soup.find('span', {'class': 'word-syllables-entry'})
+            if phonetic:
+                ret.append('<span>/' + phonetic.get_text() + '/</span>')
+            phonetic = soup.find('span', {'class': 'prons-entries-list-inline'})
+            if phonetic:
+                ret.append('<span style="margin-left:20px">[' + phonetic.get_text().strip() + ']</span>')
+            ret.append('<ul style="text-align:left;list-style-position:inside;">')
+            hasDef = False
+            for definition in soup.find_all("span", {"class" : "dt"}):
+                tag = definition.findChild()
+                if tag:
+                    ret.append('<li>' + tag.get_text().lstrip(' :') + '</li>')
+                    hasDef = True
+            if hasDef:
+                ret.append('</ul>')
+                return ''.join(ret)
+            else:
+                return ''
+        else:
+            return f'Error: {self.opener.CodeMap(resp.status_code)}'
diff --git a/application/lib/dictionary/pystardict.py b/application/lib/dictionary/pystardict.py
new file mode 100644
index 00000000..d0b0a9bd
--- /dev/null
+++ b/application/lib/dictionary/pystardict.py
@@ -0,0 +1,442 @@
+#!/usr/bin/env python3
+# -*- coding:utf-8 -*-
+#stardict词典支持，基于 <https://github.com/lig/pystardict> 修改
+import os, re, gzip, logging
+from struct import unpack
+try:
+    import marisa_trie
+except:
+    marisa_trie = None
+
+#外部接口
+class PyStarDict:
+    """
+    Dictionary-like class for lazy manipulating stardict dictionaries
+
+    All items of this dictionary are writable and dict is expandable itself,
+    but changes are not stored anywhere and available in runtime only.
+
+    We assume in this documentation that "x" or "y" is instances of the
+    StarDictDict class and "x.{ifo,idx{,.gz},dict{,.dz},syn}" or
+    "y.{ifo,idx{,.gz},dict{,.dz},syn}" is files of the corresponding stardict
+    dictionaries.
+
+    Following documentation is from the "dict" class an is subkect to rewrite
+    in further impleneted methods:
+
+    """
+
+    def __init__(self, filename_prefix):
+        """
+        filename_prefix: path to dictionary files without files extensions
+
+        initializes new StarDictDict instance from stardict dictionary files
+        provided by filename_prefix
+        """
+        self.log = logging.getLogger() #'StarDict'
+        self.ifo = _StarDictIfo(dict_prefix=filename_prefix, container=self)
+        self.idx = _StarDictIdx(dict_prefix=filename_prefix, container=self)
+        self.dict = _StarDictDict(dict_prefix=filename_prefix, container=self)
+        self.syn = _StarDictSyn(dict_prefix=filename_prefix, container=self)
+
+    def __contains__(self, k):
+        return k in self.idx
+
+    def __getitem__(self, k):
+        return self.dict[k]
+
+    def __len__(self):
+        return self.ifo.wordcount
+
+    def __repr__(self):
+        return f'{self.__class__} {self.ifo.bookname}'
+
+    def get(self, word, default=''): #type:ignore
+        return self[word] if word in self.idx else default
+
+    def has_key(self, k):
+        return k in self
+
+#词典基本信息，比如版本，名字，索引文件长度等
+class _StarDictIfo:
+    """
+    The .ifo file has the following format:
+
+    StarDict's dict ifo file
+    version=2.4.2
+    [options]
+
+    Note that the current "version" string must be "2.4.2" or "3.0.0".  If it's not,
+    then StarDict will refuse to read the file.
+    If version is "3.0.0", StarDict will parse the "idxoffsetbits" option.
+
+    [options]
+    ---------
+    In the example above, [options] expands to any of the following lines
+    specifying information about the dictionary.  Each option is a keyword
+    followed by an equal sign, then the value of that option, then a
+    newline.  The options may be appear in any order.
+
+    Note that the dictionary must have at least a bookname, a wordcount and a 
+    idxfilesize, or the load will fail.  All other information is optional.  All 
+    strings should be encoded in UTF-8.
+
+    Available options:
+
+    bookname=      // required
+    wordcount=     // required
+    synwordcount=  // required if ".syn" file exists.
+    idxfilesize=   // required
+    idxoffsetbits= // New in 3.0.0
+    author=
+    email=
+    website=
+    description=    // You can use <br> for new line.
+    date=
+    sametypesequence= // very important.
+    """
+    def __init__(self, dict_prefix, container):
+        ifo_filename = f'{dict_prefix}.ifo'
+
+        try:
+            _file = open(ifo_filename)
+        except Exception as e:
+            raise Exception('ifo file opening error: "{}"'.format(e))
+
+        _file.readline() # skipping ifo header
+        _line = _file.readline().split('=')
+        if _line[0] == 'version':
+            self.version = _line[1]
+        else:
+            raise Exception('ifo has invalid format')
+
+        _config = {}
+        for _line in _file:
+            _line_splited = _line.split('=')
+            _config[_line_splited[0]] = _line_splited[1]
+        _file.close()
+
+        self.bookname = _config.get('bookname', '').strip()
+        if not self.bookname:
+            raise Exception('ifo has no bookname')
+
+        wordcount = _config.get('wordcount', '')
+        if not wordcount:
+            raise Exception('ifo has no wordcount')
+        self.wordcount = int(wordcount)
+
+        if self.version == '3.0.0':
+            try:
+                #_syn = open(f'{dict_prefix}.syn')    # not used
+                synwordcount = _config.get('synwordcount', None)
+                if synwordcount is None:
+                    raise Exception('ifo has no synwordcount but .syn file exists')
+                self.synwordcount = int(synwordcount)
+            except IOError:
+                pass
+
+        idxfilesize = _config.get('idxfilesize', None)
+        if idxfilesize is None:
+            raise Exception('ifo has no idxfilesize')
+        self.idxfilesize = int(idxfilesize)
+
+        self.idxoffsetbits = int(_config.get('idxoffsetbits', 32))
+        self.author = _config.get('author', '').strip()
+        self.email = _config.get('email', '').strip()
+        self.website = _config.get('website', '').strip()
+        self.description = _config.get('description', '').strip()
+        self.date = _config.get('date', '').strip()
+        self.sametypesequence = _config.get('sametypesequence', '').strip()
+
+#idx, 词条的索引文件，按升序排序。
+class _StarDictIdx:
+    """
+    The .idx file is just a word list.
+
+    The word list is a sorted list of word entries.
+
+    Each entry in the word list contains three fields, one after the other:
+         word_str;  // a utf-8 string terminated by '\0' (长度小于256，所收词条单词)
+         word_data_offset;  // word data's offset in .dict file (32bit/64bit 无符号整数 网络字节序列)
+         word_data_size;  // word data's total size in .dict file (32bit 无符号整数 网络字节序列)
+    如果ifo包含idxoffsetbits字段，表示字典偏移长度为64位，即8字节
+    """
+    def __init__(self, dict_prefix, container):
+        self._container = container
+
+        dict_name = os.path.basename(dict_prefix)
+        idx_filename = f'{dict_prefix}.idx'
+        idx_filename_gz = f'{idx_filename}.gz'
+        trie_filename = f'{dict_prefix}.trie'
+        fmt_filename = f'{dict_prefix}.fmt'
+        self.trie = None
+        if os.path.exists(trie_filename) and os.path.exists(fmt_filename):
+            try:
+                with open(fmt_filename, 'r') as f:
+                    fmt = f.read()
+                self.trie = marisa_trie.RecordTrie(fmt)
+                self.trie.load(trie_filename)
+            except Exception as e:
+                self.trie = None
+                container.log.warning(f'Failed to load stardict trie data: {dict_name}: {e}')
+
+        if self.trie:
+            return
+
+        #分析索引数据，构建前缀树
+        container.log.info(f"Building trie for {dict_name}")
+        try:
+            file = open_file(idx_filename, idx_filename_gz)
+        except Exception as e:
+            raise Exception('idx file opening error: "{}"'.format(e))
+
+        _file = file.read()
+
+        #check file size
+        if file.tell() != container.ifo.idxfilesize:
+            file.close()
+            raise Exception('size of the .idx file is incorrect')
+
+        file.close()
+
+        #prepare main dict and parsing parameters
+        bytes_size = int(container.ifo.idxoffsetbits / 8)
+        offset_format = 'L' if bytes_size == 4 else 'Q'
+        record_size = str(bytes_size + 4).encode('utf-8') #偏移+数据长
+
+        #parse data via regex
+        record_pattern = br'(.+?\x00.{' + record_size + br'})'
+        matched_records = re.findall(record_pattern, _file, re.DOTALL) #type:ignore
+
+        #check records count
+        if len(matched_records) != container.ifo.wordcount:
+            raise Exception('words count is incorrect')
+
+        #unpack parsed records
+        idxBuff = []
+        for matched_record in matched_records:
+            cnt = matched_record.find(b'\x00') + 1
+            record_tuple = unpack(f'!{cnt}c{offset_format}L', matched_record)
+            word = b''.join(record_tuple[:cnt-1]).decode('utf8').lower()
+            idxBuff.append((word, record_tuple[cnt:])) #(word, (offset, size))
+
+        fmt = f"!{offset_format}L"
+        self.trie = marisa_trie.RecordTrie(fmt, idxBuff)
+        self.trie.save(trie_filename)
+        with open(fmt_filename, 'w') as f:
+            f.write(fmt)
+
+        del self.trie
+        self.trie = marisa_trie.RecordTrie(fmt)
+        self.trie.load(trie_filename)
+        del _file
+        del matched_records
+        del idxBuff
+        import gc
+        gc.collect()
+        
+    def __getitem__(self, word) -> tuple:
+        """
+        returns tuple (word_data_offset, word_data_size,) for word in .dict
+
+        @note: here may be placed flexible search realization
+        """
+        return self.trie[word.lower()][0] #type:ignore
+        
+    def __contains__(self, word) -> bool:
+        return word.lower() in self.trie
+
+#实际的词典数据
+class _StarDictDict:
+    """
+    The .dict file is a pure data sequence, as the offset and size of each
+    word is recorded in the corresponding .idx file.
+
+    If the "sametypesequence" option is not used in the .ifo file, then
+    the .dict file has fields in the following order:
+    ==============
+    word_1_data_1_type; // a single char identifying the data type
+    word_1_data_1_data; // the data
+    word_1_data_2_type;
+    word_1_data_2_data;
+    ...... // the number of data entries for each word is determined by
+           // word_data_size in .idx file
+    word_2_data_1_type;
+    word_2_data_1_data;
+    ......
+    ==============
+    It's important to note that each field in each word indicates its
+    own length, as described below.  The number of possible fields per
+    word is also not fixed, and is determined by simply reading data until
+    you've read word_data_size bytes for that word.
+
+
+    Suppose the "sametypesequence" option is used in the .idx file, and
+    the option is set like this:
+    sametypesequence=tm
+    Then the .dict file will look like this:
+    ==============
+    word_1_data_1_data
+    word_1_data_2_data
+    word_2_data_1_data
+    word_2_data_2_data
+    ......
+    ==============
+    The first data entry for each word will have a terminating '\0', but
+    the second entry will not have a terminating '\0'.  The omissions of
+    the type chars and of the last field's size information are the
+    optimizations required by the "sametypesequence" option described
+    above.
+
+    If "idxoffsetbits=64", the file size of the .dict file will be bigger 
+    than 4G. Because we often need to mmap this large file, and there is 
+    a 4G maximum virtual memory space limit in a process on the 32 bits 
+    computer, which will make we can get error, so "idxoffsetbits=64" 
+    dictionary can't be loaded in 32 bits machine in fact, StarDict will 
+    simply print a warning in this case when loading. 64-bits computers 
+    should haven't this limit.
+
+    Type identifiers
+    ----------------
+    Here are the single-character type identifiers that may be used with
+    the "sametypesequence" option in the .idx file, or may appear in the
+    dict file itself if the "sametypesequence" option is not used.
+
+    Lower-case characters signify that a field's size is determined by a
+    terminating '\0', while upper-case characters indicate that the data
+    begins with a network byte-ordered guint32 that gives the length of 
+    the following data's size(NOT the whole size which is 4 bytes bigger).
+
+    'm'
+    Word's pure text meaning.
+    The data should be a utf-8 string ending with '\0'.
+
+    'l'
+    Word's pure text meaning.
+    The data is NOT a utf-8 string, but is instead a string in locale
+    encoding, ending with '\0'.  Sometimes using this type will save disk
+    space, but its use is discouraged.
+
+    'g'
+    A utf-8 string which is marked up with the Pango text markup language.
+    For more information about this markup language, See the "Pango
+    Reference Manual."
+    You might have it installed locally at:
+    file:///usr/share/gtk-doc/html/pango/PangoMarkupFormat.html
+
+    't'
+    English phonetic string.
+    The data should be a utf-8 string ending with '\0'.
+
+    Here are some utf-8 phonetic characters:
+    θʃŋʧðʒæıʌʊɒɛəɑɜɔˌˈːˑṃṇḷ
+    æɑɒʌәєŋvθðʃʒɚːɡˏˊˋ
+
+    'x'
+    A utf-8 string which is marked up with the xdxf language.
+    See http://xdxf.sourceforge.net
+    StarDict have these extention:
+    <rref> can have "type" attribute, it can be "image", "sound", "video" 
+    and "attach".
+    <kref> can have "k" attribute.
+
+    'y'
+    Chinese YinBiao or Japanese KANA.
+    The data should be a utf-8 string ending with '\0'.
+
+    'k'
+    KingSoft PowerWord's data. The data is a utf-8 string ending with '\0'.
+    It is in XML format.
+
+    'w'
+    MediaWiki markup language.
+    See http://meta.wikimedia.org/wiki/Help:Editing#The_wiki_markup
+
+    'h'
+    Html codes.
+
+    'r'
+    Resource file list.
+    The content can be:
+    img:pic/example.jpg     // Image file
+    snd:apple.wav           // Sound file
+    vdo:film.avi            // Video file
+    att:file.bin            // Attachment file
+    More than one line is supported as a list of available files.
+    StarDict will find the files in the Resource Storage.
+    The image will be shown, the sound file will have a play button.
+    You can "save as" the attachment file and so on.
+
+    'W'
+    wav file.
+    The data begins with a network byte-ordered guint32 to identify the wav
+    file's size, immediately followed by the file's content.
+
+    'P'
+    Picture file.
+    The data begins with a network byte-ordered guint32 to identify the picture
+    file's size, immediately followed by the file's content.
+
+    'X'
+    this type identifier is reserved for experimental extensions.
+
+    """
+
+    def __init__(self, dict_prefix, container):
+        """
+        opens regular or dziped .dict file
+        """
+        self._container = container
+
+        dict_filename = f'{dict_prefix}.dict'
+        dict_filename_dz = f'{dict_filename}.dz'
+
+        try:
+            f = open_file(dict_filename, dict_filename_dz)
+        except Exception as e:
+            raise Exception('dict file opening error: "{}"'.format(e))
+
+        self._file = f
+
+    def __getitem__(self, word) -> bytes:
+        """
+        returns data from .dict for word
+        """
+        cords = self._container.idx[word]
+        self._file.seek(cords[0])
+        return self._file.read(cords[1]) #type:ignore
+
+    def __contains__(self, word):
+        return word in self._container.idx
+
+class _StarDictSyn(object):
+    def __init__(self, dict_prefix, container):
+        syn_filename = f'{dict_prefix}.syn'
+
+        #try:
+        #    self._file = open(syn_filename)
+        #except IOError:
+        #    # syn file is optional, passing silently
+        #    pass
+
+def open_file(regular, gz):
+    """
+    Open regular file if it exists, gz file otherwise.
+    If no file exists, raise ValueError.
+    """
+    if os.path.exists(regular):
+        try:
+            return open(regular, 'rb')
+        except Exception as e:
+            raise Exception('regular file opening error: "{}"'.format(e))
+
+    #压缩索引文件后缀一般是gz，使用gzip压缩, 
+    #压缩数据文件后缀一般是dz，使用dictzip压缩，dictzip使用与 gzip 相同的压缩算法和文件格式，
+    #但是它提供一个表可以用来在文件中随机访问压缩块。
+    if os.path.exists(gz):
+        try:
+            return gzip.open(gz, 'rb')
+        except Exception as e:
+            raise Exception('gz file opening error: "{}"'.format(e))
+
+    raise ValueError('Neither regular nor gz file exists')
diff --git a/application/lib/dictionary/stardict.py b/application/lib/dictionary/stardict.py
new file mode 100644
index 00000000..f13fb539
--- /dev/null
+++ b/application/lib/dictionary/stardict.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+# -*- coding:utf-8 -*-
+#stardict离线词典支持
+import os
+from .pystardict import PyStarDict
+
+#获取本地的stardict文件列表，只有列表，没有校验是否有效
+def getStarDictList():
+    dictDir = os.environ.get('DICTIONARY_DIR')
+    if not dictDir or not os.path.exists(dictDir):
+        return {}
+
+    ret = {}
+    for dirPath, _, fileNames in os.walk(dictDir):
+        for fileName in fileNames:
+            if fileName.endswith('.ifo'):
+                dictName = os.path.splitext(fileName)[0]
+                #为了界面显示和其他dict的一致，键为词典路径，值为词典名字
+                ret[os.path.join(dirPath, dictName)] = dictName
+    return ret
+
+class StarDict:
+    name = "stardict"
+    #词典列表，键为词典缩写，值为词典描述
+    databases = getStarDictList()
+
+    def __init__(self, database='', host=None):
+        self.database = database
+        self.dictionary = None
+        if database in self.databases:
+            try:
+                self.dictionary = PyStarDict(database)
+            except Exception as e:
+                default_log.warning(f'Instantiate stardict failed: {database}: {e}')
+
+    #返回当前使用的词典名字
+    def __repr__(self):
+        return 'stardict [{}]'.format(self.databases.get(self.database, ''))
+        
+    def definition(self, word, language=''):
+        ret = self.dictionary.get(word) if self.dictionary else ''
+        return ret.decode('utf-8') if isinstance(ret, bytes) else ret
diff --git a/application/static/base.js b/application/static/base.js
index 0cb68f44..dcb0a025 100644
--- a/application/static/base.js
+++ b/application/static/base.js
@@ -1648,7 +1648,7 @@ function SendTestEmail() {
 //根据词典引擎列表 g_dictEngines 和 当前配置 g_dictParams 填充下拉框
 function PopulateDictFields() {
   for (var idx = 0; idx < 3; idx++) {
-    var cfg = g_dictsCfg[idx];
+    var cfg = g_dictParams[idx];
     var engineSel = $('#dict_engine' + idx);
     engineSel.empty();
     var engineName = cfg.engine;
@@ -1671,7 +1671,7 @@ function DictEngineFieldChanged(idx) {
   if (!databases) {
     return;
   }
-  var currDb = g_dictsCfg[idx].database;
+  var currDb = g_dictParams[idx].database;
   for (var name in databases) {
     var selected = (currDb == name) ? 'selected="selected"' : '';
     var txt = `<option value="${name}" ${selected}>${databases[name]}</option>`;
diff --git a/application/static/reader.css b/application/static/reader.css
index c5777989..6445977e 100644
--- a/application/static/reader.css
+++ b/application/static/reader.css
@@ -1,6 +1,8 @@
 * {
   padding: 0px;
   margin: 0px;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-touch-callout: none;
 }
 html, body {
   padding: 0px;
@@ -35,6 +37,7 @@ body::-webkit-scrollbar-thumb {
   height: 100%;
   width: 100%;
   box-sizing: border-box;
+  -webkit-overflow-scrolling: auto;
 }
 .embedded-iframe {
   padding: 10px 20px 10px 10px;
@@ -60,6 +63,25 @@ body::-webkit-scrollbar-thumb {
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 5px;
 }
+.corner-dict-hint {
+  display: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-width: 50px 50px 0 0;
+  border-color: #291E1E transparent transparent transparent;
+}
+.corner-dict-hint svg {
+  position: absolute;
+  top: -50px;
+  left: 3px;
+  width: 30px;
+  height: 30px;
+  fill: white;
+}
 
 .navbar {
   position: fixed;
@@ -133,6 +155,7 @@ body::-webkit-scrollbar-thumb {
   box-sizing: border-box;
   padding-bottom: 30px;
   position: relative;
+  scroll-behavior: smooth;
 }
 .nav-indicator {
   position: absolute;
@@ -299,13 +322,36 @@ body::-webkit-scrollbar-thumb {
   border-radius: 20px;
   box-shadow: 0px 0px 3px #aaa;
   display: none;
-  min-width: 200px;
+  min-width: 300px;
   max-width: 80%;
   max-height: 400px;
   cursor: pointer;
   overflow: hidden;
   width: fit-content;
 }
+.tr-dict-name {
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  max-width: 250px;
+  height: 20px;
+  text-align: left;
+  overflow: hidden;
+  color: #555;
+  background-color: white;
+  font-size: 0.7em;
+}
+.tr-dict-name select {
+  margin: 0;
+  padding: 0;
+  outline: none;
+  border: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  font-size: 0.7em;
+  text-decoration: underline;
+}
 .tr-scrl-up-icon {
   position: absolute;
   top: 80px;
@@ -350,8 +396,8 @@ body::-webkit-scrollbar-thumb {
   font-weight: bolder;
 }
 .tr-word {
-  margin: 10px auto 10px auto;
-  padding: 10px 50px 10px 40px;
+  margin: 10px auto 0px auto;
+  padding: 25px 50px 5px 40px;
   font-weight: bold;
   text-align: center;
   border-bottom: 1px dotted #ccc;
diff --git a/application/static/reader.js b/application/static/reader.js
index 97057b09..678ecde4 100644
--- a/application/static/reader.js
+++ b/application/static/reader.js
@@ -25,6 +25,16 @@ function isEmpty(obj) {
   return true;
 }
 
+//将一个字符串转义为能安全用于js字符串拼接的场合
+function encodeJsSafeStr(str) {
+  return btoa(encodeURIComponent(str));
+}
+
+//安全的解码经过 encodeJsSafeStr 编码的字符串
+function decodeJsSafeStr(str) {
+  return decodeURIComponent(atob(str));
+}
+
 //将一个字典对象转换为ajax使用的参数字符串
 function formatParams(data) {
   var arr = [("v_=" + Math.random()).replace(".", "")];
@@ -150,8 +160,13 @@ function getWordAtClick(event, iframe) {
         return clickedChar;
       }
 
-      var leftMatch = leftText.match(/\p{L}+$/u);
-      var rightMatch = rightText.match(/^\p{L}+/u);
+      //var leftMatch = leftText.match(/\p{L}+$/u); //kindle不支持 "\p{L}"
+      //var rightMatch = rightText.match(/^\p{L}+/u);
+      var unicodeLetters = "\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u01BF\u01CD-\u01FF\u0620-\u064A";
+      var patLeft = new RegExp("[" + unicodeLetters + "]+$");
+      var patRight = new RegExp("^[" + unicodeLetters + "]+");
+      var leftMatch = leftText.match(patLeft);
+      var rightMatch = rightText.match(patRight);
       if (leftMatch || rightMatch) {
         return (leftMatch ? leftMatch[0] : '') + (rightMatch ? rightMatch[0] : '');
       }
@@ -161,14 +176,13 @@ function getWordAtClick(event, iframe) {
 }
 
 //连接服务器查询一个单词的释义然后显示出来
-//event: click event
 //word: 要查的词
 //selection: 是否有选择区域
-function translateWord(event, word, selection) {
+function translateWord(word, selection) {
   var language = isEmpty(g_currentArticle) ? '' : getBookLanguage(g_currentArticle);
   ajax_post('/reader/dict', {word: word, language: language}, function (resp) {
     if (resp.status == 'ok') {
-      displayDictDialog(resp.word, resp.definition);
+      showDictDialog(resp.word, resp.definition, resp.dictname, resp.others);
       if (selection) {
         selection.removeAllRanges();
       }
@@ -178,39 +192,78 @@ function translateWord(event, word, selection) {
   });
 }
 
-//显示查词窗口
-function displayDictDialog(word, text) {
-    var content = document.getElementById('content');
-    var dialog = document.getElementById('tr-result');
-    var titleDiv = document.getElementById('tr-word');
-    var textWrap = document.getElementById('tr-text-container');
-    var textDiv = document.getElementById('tr-text');
-    titleDiv.innerHTML = word;
-    textDiv.innerHTML = text.replace(/\n/g, '<br/>');
-    console.log(textDiv.innerHTML);
-    var y = Math.max(event.clientY - content.scrollTop, 0);
-    var height = content.clientHeight;
-    if (y > height * 0.6) {
-      dialog.style.top = 'auto';
-      dialog.style.bottom = Math.max(height - y, 40) + 'px';
+//在查词窗口选择其他词典，则使用其他词典再次翻译
+function changeDictToTranslate(event) {
+  event.stopPropagation();
+  event.preventDefault();
+  var sel = document.getElementById('tr-dict-name-sel');
+  var value = sel ? sel.value : '';
+  if (!value) {
+    return;
+  }
+  value = decodeJsSafeStr(value).split('::');
+  var word = value[0];
+  var language = value[1];
+  var engine = value[2];
+  var database = value[3];
+  ajax_post('/reader/dict', {word: word, language: language, engine: engine, database: database}, function (resp) {
+    if (resp.status == 'ok') {
+      showDictDialog(resp.word, resp.definition, resp.dictname, resp.others);
     } else {
-      dialog.style.bottom = 'auto';
-      dialog.style.top = (y + 20) + 'px';
+      alert(resp.status);
     }
-    dialog.style.display = 'block';
-    textWrap.scrollTop = 0;
-    //根据情况确定是否显示上下翻页按钮
-    var scrlUp = document.getElementById('tr-scrl-up-icon');
-    var scrlDown = document.getElementById('tr-scrl-down-icon');
-    if (isMobile() && (textWrap.scrollHeight > g_trTextContainerHeight)) {
-      scrlUp.style.display = 'block';
-      scrlDown.style.display = 'block';
-      textDiv.style.paddingRight = '40px';
-    } else {
-      scrlUp.style.display = 'none';
-      scrlDown.style.display = 'none';
-      textDiv.style.paddingRight = '10px';
+  });
+}
+
+//显示查词窗口
+//word, text - 分别为单词和释义
+//dictname: 返回当前释义的词典名字
+//others: 其他候选词典列表 [{language:,engine:,database:,dbName}]
+function showDictDialog(word, text, dictname, others) {
+  var content = document.getElementById('content');
+  var dialog = document.getElementById('tr-result');
+  var dictNameDiv = document.getElementById('tr-dict-name-sel');
+  var titleDiv = document.getElementById('tr-word');
+  var textWrap = document.getElementById('tr-text-container');
+  var textDiv = document.getElementById('tr-text');
+  var ostr = ['<option value="">▽ ' + (dictname || '') + '</option>'];
+  for (var i = 0; i < others.length; i++) {
+    var elem = others[i];
+    if (elem.language && elem.engine && elem.database) {
+      var value = encodeJsSafeStr(word + '::' + elem.language + '::' + elem.engine + '::' + elem.database);
+      var dbName = elem.dbName;
+      if (dbName.length < 15) {
+        dbName = elem.engine + ' [' + dbName + ']';
+      }
+      ostr.push('<option value="' + value + '">' + elem.dbName + '</option>');
     }
+  }
+  dictNameDiv.innerHTML = ostr.join('');
+  titleDiv.innerHTML = word;
+  textDiv.innerHTML = text.replace(/\n/g, '<br/>');
+  var y = Math.max(event.clientY - content.scrollTop, 0);
+  var height = content.clientHeight;
+  if (y > height * 0.6) {
+    dialog.style.top = 'auto';
+    dialog.style.bottom = Math.max(height - y, 40) + 'px';
+  } else {
+    dialog.style.bottom = 'auto';
+    dialog.style.top = (y + 20) + 'px';
+  }
+  dialog.style.display = 'block';
+  textWrap.scrollTop = 0;
+  //根据情况确定是否显示上下翻页按钮
+  var scrlUp = document.getElementById('tr-scrl-up-icon');
+  var scrlDown = document.getElementById('tr-scrl-down-icon');
+  if (isMobile() && (textWrap.scrollHeight > g_trTextContainerHeight)) {
+    scrlUp.style.display = 'block';
+    scrlDown.style.display = 'block';
+    textDiv.style.paddingRight = '40px';
+  } else {
+    scrlUp.style.display = 'none';
+    scrlDown.style.display = 'none';
+    textDiv.style.paddingRight = '10px';
+  }
 }
 
 //查词窗口向上滚动
@@ -240,8 +293,12 @@ function clickEvent(event) {
   //alert(x + ',' + event.clientY + ',' + content.scrollTop + ',' + content.clientHeight);
   navPopMenu.style.display = 'none';
   if (y < wh / 5) { //上部 (20%)
-    if (x < ww * 0.15) { //左上 15%，上一篇文章
-      openPrevArticle();
+    if (x < ww * 0.15) { //左上 15%，上一篇文章或直接激活查词模式
+      if (g_topleftDict) {
+        toggleDictMode();
+      } else {
+        openPrevArticle();
+      }
     } else if (x > ww * 0.8) { //右上 20%，下一篇文章
       openNextArticle();
     } else if (isMobile()) { //中间65%，弹出菜单
@@ -270,6 +327,11 @@ function pageUp(content, navbar) {
   }
 }
 
+//禁用事件的默认处理事件
+function eventPreventDefault(event) {
+  event.preventDefault();
+}
+
 //往下翻页
 function pageDown(content, navbar) {
   content = content || document.getElementById('content');
@@ -493,7 +555,7 @@ function navDeleteBooks(event) {
 
 //删除本地数组中的元素然后更新页面，books为数组，元素为 'date/title'
 function deleteBooksAndUpdateUi(books) {
-  //[{date:, books: [{title:, articles:[{text:, src:}],},...]}, ]
+  //[{date:, books: [{title:, articles:[{title:, src:}],},...]}, ]
   var removeSet = new Set(books);
   g_books = g_books.filter(function (entry) {
       entry.books = entry.books.filter(function (book) {
@@ -507,10 +569,10 @@ function deleteBooksAndUpdateUi(books) {
 //显示/隐藏导航设置菜单
 function toggleNavPopMenu() {
   var menu = document.getElementById('nav-popmenu');
-  //var inkIcon = document.getElementById('ink-mode').querySelector('.check-icon');
-  //inkIcon.innerHTML = g_inkMode ? '✔' : '☐';
   var allowIcon = document.getElementById('allow-links').querySelector('.check-icon');
   allowIcon.innerHTML = g_allowLinks ? '✔' : '☐';
+  var actIcon = document.getElementById('topleft-activate-dict').querySelector('.check-icon');
+  actIcon.innerHTML = g_topleftDict ? '✔' : '☐';
   menu.style.display = (menu.style.display == 'block') ? 'none' : 'block';
 }
 
@@ -536,7 +598,8 @@ function decreaseFontSize() {
 
 //将目前的配置保存到服务器
 function saveSettings() {
-  ajax_post('/reader/settings', {fontSize: g_fontSize, allowLinks: g_allowLinks, inkMode: g_inkMode});
+  ajax_post('/reader/settings', {fontSize: g_fontSize, allowLinks: g_allowLinks, inkMode: g_inkMode,
+    topleftDict: g_topleftDict});
 }
 
 //显示触摸区域图示
@@ -572,6 +635,14 @@ function toggleAllowLinks() {
   saveSettings();
 }
 
+//切换左上角模式，默认为前一本书，可以切换为直接进入查词模式
+function toggleTopleftDict() {
+  g_topleftDict = !g_topleftDict;
+  var actIcon = document.getElementById('topleft-activate-dict').querySelector('.check-icon');
+  actIcon.innerHTML = g_topleftDict ? '✔' : '☐';
+  saveSettings();
+}
+
 //是否允许墨水屏模式
 function toggleInkMode() {
   g_inkMode = !g_inkMode;
@@ -582,16 +653,16 @@ function toggleInkMode() {
 //切换查词模式
 function toggleDictMode() {
   g_dictMode = !g_dictMode;
-  document.getElementById('tr-result').style.display='none';
-  document.getElementById('dict-mode').style.border = g_dictMode ? '2px solid #000' : 'none';
+  document.getElementById('tr-result').style.display = 'none';
+  document.getElementById('corner-dict-hint').style.display = g_dictMode ? 'block' : 'none';
   hideNavbar();
 }
 
 //关闭查词窗口
 function closeDictDialog() {
   g_dictMode = false;
-  document.getElementById('tr-result').style.display='none';
-  document.getElementById('dict-mode').style.border = 'none';
+  document.getElementById('tr-result').style.display = 'none';
+  document.getElementById('corner-dict-hint').style.display = 'none';
 }
 
 //根据是否使能墨水屏模式，设置相应的元素属性
@@ -660,14 +731,14 @@ function populateBooks(expandLevel) {
           '<div class="nav-article">');
       for (var aIdx = 0; aIdx < articles.length; aIdx++) {
         var article = articles[aIdx];
-        if (!article || !article.src || !article.text) {
+        if (!article || !article.src || !article.title) {
           continue;
         }
         ostr.push(
              '<div class="nav-title" data-src="' + article.src +'">' +
                 '<div>' +
                   articleSvgIcon() +
-                  '<span class="nav-title-text">' + article.text + '</span>' +
+                  '<span class="nav-title-text">' + article.title + '</span>' +
                 '</div>' +
               '</div>');
       }
@@ -719,7 +790,7 @@ function navClickEvent(event) {
     var span = navTitle.querySelector('.nav-title-text');
     var text = span ? span.textContent.trim() : '';
     if (src && text) {
-      openArticle({text: text, src: src});
+      openArticle({title: text, src: src});
     }
   } else if (navBook) {
     toggleNavBook(navBook);
@@ -732,9 +803,9 @@ function navClickEvent(event) {
 function pushCurrentBook() {
   var art = g_currentArticle;
   if (!isEmpty(art)) {
-    ajax_post('/reader/push', {type: 'book', src: art.src, title: art.text}, function (resp) {
+    ajax_post('/reader/push', {type: 'book', src: art.src, title: art.title}, function (resp) {
       if (resp.status == 'ok') {
-        alert(i18n.pushOk + '\n' + art.text);
+        alert(i18n.pushOk + '\n' + art.title);
       } else {
         alert(resp.status);
       }
@@ -750,10 +821,10 @@ function pushCurrentArticle() {
   var art = g_currentArticle;
   if (!isEmpty(art)) {
     var language = getBookLanguage(art);
-    ajax_post('/reader/push', {type: 'article', src: art.src, title: art.text, language: language}, 
+    ajax_post('/reader/push', {type: 'article', src: art.src, title: art.title, language: language}, 
       function (resp) {
         if (resp.status == 'ok') {
-          alert(i18n.pushOk + '\n' + art.text);
+          alert(i18n.pushOk + '\n' + art.title);
         } else {
           alert(resp.status);
         }
@@ -830,7 +901,7 @@ function findPreviousArticle(art) {
 }
 
 //给定一篇文章，返回此文章后一篇文章，如果art为空，则返回第一篇找到的文章
-//返回为一个字典 {text:, src:,}
+//返回为一个字典 {title:, src:,}
 function findNextArticle(art) {
   var found = false;
   for (var i = 0; i < g_books.length; i++) {
@@ -872,12 +943,12 @@ function iframeLoadEvent(evt) {
     var selection = doc.getSelection();
     var text = selection.toString();
     if (g_dictMode) {
-      g_dictMode = false;
-      document.getElementById('dict-mode').style.border = 'none';
       text = text || getWordAtClick(event, iframe);
       if (text) {
-        translateWord(event, text, selection);
+        translateWord(text, selection);
       }
+      g_dictMode = false;
+      document.getElementById('corner-dict-hint').style.display = 'none';
     } else if (!text) { //没有选择文本才翻页
       clickEvent(event);
     }
@@ -897,8 +968,16 @@ function adjustIFrameStyle(iframe) {
   body.style.marginRight = '10px';
   body.style.fontSize = g_fontSize.toFixed(1) + 'em';
   body.style.cursor = 'pointer';
+  body.style.webkitTapHighlightColor = 'transparent';
+  body.style.webkitTouchCallout = 'none';
   iframe.style.display = "block";
 
+  var images = doc.querySelectorAll('img');
+  for (var i = 0; i < images.length; i++) {
+    images[i].style.maxWidth = '100%';
+    images[i].style.height = 'auto';
+  }
+
   var vh = getViewportHeight();
   g_iframeScrollHeight = Math.max(doc.documentElement.scrollHeight || body.scrollHeight, vh);
   //g_iframeClientHeight = Math.max(doc.documentElement.clientHeight || body.clientHeight, vh);
diff --git a/application/templates/adv_dict.html b/application/templates/adv_dict.html
index 2794c653..76a20880 100644
--- a/application/templates/adv_dict.html
+++ b/application/templates/adv_dict.html
@@ -18,7 +18,7 @@
     <label>{{_("Book language")}}</label>
     <select class="pure-u-1 pure-u-sm-1-2" name="language0">
       {% for code,name in langMap.items() -%}
-      {% set lang0 = dictsCfg[0].get('language', '') -%}
+      {% set lang0 = dictParams[0].get('language', '') -%}
       <option value="{{code}}" {% if lang0 and code.startswith(lang0) %}selected="selected"{% endif %}>{{name}}</option>
       {% endfor -%}
     </select>
@@ -40,7 +40,7 @@
     <label>{{_("Book language")}}</label>
     <select class="pure-u-1 pure-u-sm-1-2" name="language1">
       {% for code,name in langMap.items() -%}
-      {% set lang1 = dictsCfg[1].get('language', '') -%}
+      {% set lang1 = dictParams[1].get('language', '') -%}
       <option value="{{code}}" {% if lang1 and code.startswith(lang1) %}selected="selected"{% endif %}>{{name}}</option>
       {% endfor -%}
     </select>
@@ -88,7 +88,7 @@
 {% block js -%}
 <script type="text/javascript">
 var g_dictEngines = {{engines|safe}};
-var g_dictsCfg = {{dictsCfg|safe}}; //[{language:,engine:,database:,},]
+var g_dictParams = {{dictParams|safe}}; //[{language:,engine:,database:,},]
 
 $(document).ready(function() {
   PopulateDictFields();
diff --git a/application/templates/my.html b/application/templates/my.html
index db7beae6..006f7a18 100644
--- a/application/templates/my.html
+++ b/application/templates/my.html
@@ -48,7 +48,7 @@
     <!-- 由脚本在这里填充数据 -->
   </div>
 
-  <legend>{{_("Library")}}</legend>
+  <legend>{{_("Library")}}&nbsp;&nbsp;<small><a href="https://www.mobileread.com/forums/forumdisplay.php?f=228" target="_blank" style="text-decoration:none;font-weight:normal;color:#555">[{{_("get more recipes")}}]</a></small></legend>
   <div class="pure-g box-list noborder lib-header">
     <div class="pure-u-1-3 width1_3 pure-form">
       <select class="pure-input-rounded width100" id="language_pick">
diff --git a/application/templates/reader.html b/application/templates/reader.html
index 48d39e4f..2d7cf9c5 100644
--- a/application/templates/reader.html
+++ b/application/templates/reader.html
@@ -12,8 +12,18 @@
       <iframe src="{{initArticle|safe}}" id="iframe" class="embedded-iframe" sandbox="allow-same-origin allow-scripts" scrolling="no" frameborder="0">Browser not compatible.</iframe>
     </div>
     <div class="pos-indicator" id="pos-indicator"></div>
+    <!-- 左上角的三角形查词模式显示 -->
+    <div class="corner-dict-hint" id="corner-dict-hint">
+      <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+        <path fill="white" d="M10.9 12.9H9.1l-.6 1.2c-.1.1-.2.2-.3.2s-.3 0-.4-.1c-.1-.1-.2-.2-.1-.4L9.7 9.9c.1-.1.2-.3.3-.3s.3.1.3.3l1.8 3.9c.1.1 0 .3-.1.4-.1.1-.2.1-.3.1s-.3-.1-.4-.2zm-.3-.7L10 10.9l-.6 1.2zm-4.1-9.6h9.3c.1 0 .2.1.3.2s.1.2 0 .3c-.1.1-.2.2-.3.2H6.4c-1 0-1.8.8-1.8 1.8s.8 1.8 1.8 1.8h9.3c.2 0 .3.1.3.3v10c0 .2-.1.3-.3.3H6.4c-1.4 0-2.5-1.1-2.5-2.5v-10c0-1.4 1.1-2.5 2.5-2.5zm-1.8 4.2v8.2c0 1 .8 1.8 1.8 1.8h8.9V7.5H6.4c-.7 0-1.3-.3-1.8-.8zm1.8-1.4c-.2 0-.3-.1-.3-.3s.1-.3.3-.3H15c.2 0 .3.1.3.3s-.1.3-.3.3H6.4z"/>
+      </svg>
+    </div>
     <!-- 查词典的结果显示窗口 -->
     <div class="tr-result" id="tr-result" onclick="closeDictDialog()">
+      <div class="tr-dict-name" id="tr-dict-name">
+        <select id="tr-dict-name-sel" onclick="javascript:event.stopPropagation()" onchange="changeDictToTranslate(event)">
+        </select>
+      </div>
       <div class="tr-scrl-up-icon" id="tr-scrl-up-icon" onclick="dictScrollUp(event)">
         <svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 20 20">
           <path d="M 4.375 12.8125 L 10 7.1875 L 15.625 12.8125" stroke="black" stroke-width="1.875" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
@@ -66,6 +76,11 @@
           <span class="check-icon"></span>
           <span>{{_("Allow click links")}}</span>
         </div>
+      </div><div class="nav-popmenu-row" id="topleft-activate-dict" onclick="toggleTopleftDict()">
+        <div class="nav-popmenu-item">
+          <span class="check-icon"></span>
+          <span>{{_("Top-left dict mode")}}</span>
+        </div>
       </div>
       <!-- <div class="nav-popmenu-row" id="ink-mode" onclick="toggleInkMode()">
         <div class="nav-popmenu-item">
@@ -155,12 +170,13 @@
   
   {% autoescape off -%}
   <script type="text/javascript">
-    var g_books = {{oebBooks|safe}}; //[{date:, books: [{title:, articles:[{text:, src:}],},...]}, ]
-    var g_allowLinks = "{{params.get('allowLinks', '')}}"; //all,web,ke,''
+    var g_books = {{oebBooks|safe}}; //[{date:, books: [{title:, articles:[{title:, src:}],},...]}, ]
+    var g_allowLinks = {{params.get('allowLinks', 0)}};
+    var g_topleftDict = {{params.get('topleftDict', 1)}};
     var g_inkMode = {{params.get('inkMode', 1)}};
     var g_fontSize = {{params.get('fontSize', 1.0)}};
     var g_shareKey = "{{shareKey}}";
-
+    
     var i18n = {
       confirmDelete: "{{_('Confirm Deletion')|safe}}",
       areYouSureDelete: "{{_('Are you sure to delete?')|safe}}",
diff --git a/application/templates/reader_404.html b/application/templates/reader_404.html
index 01fa5e41..203a699a 100644
--- a/application/templates/reader_404.html
+++ b/application/templates/reader_404.html
@@ -9,6 +9,8 @@
       padding: 0;
       margin: 0;
       box-sizing: border-box;
+      -webkit-tap-highlight-color: transparent;
+      -webkit-touch-callout: none;
     }
     html, body {
       height: 100%;
@@ -121,7 +123,15 @@
     <div class="hint-top">
       <table>
         <tr>
+          {% if params.get('topleftDict', 1) -%}
+          <td class="prev-article">
+            <svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 20 20">
+              <path fill="#000" d="M10.9 12.9H9.1l-.6 1.2c-.1.1-.2.2-.3.2s-.3 0-.4-.1c-.1-.1-.2-.2-.1-.4L9.7 9.9c.1-.1.2-.3.3-.3s.3.1.3.3l1.8 3.9c.1.1 0 .3-.1.4-.1.1-.2.1-.3.1s-.3-.1-.4-.2zm-.3-.7L10 10.9l-.6 1.2zm-4.1-9.6h9.3c.1 0 .2.1.3.2s.1.2 0 .3c-.1.1-.2.2-.3.2H6.4c-1 0-1.8.8-1.8 1.8s.8 1.8 1.8 1.8h9.3c.2 0 .3.1.3.3v10c0 .2-.1.3-.3.3H6.4c-1.4 0-2.5-1.1-2.5-2.5v-10c0-1.4 1.1-2.5 2.5-2.5zm-1.8 4.2v8.2c0 1 .8 1.8 1.8 1.8h8.9V7.5H6.4c-.7 0-1.3-.3-1.8-.8zm1.8-1.4c-.2 0-.3-.1-.3-.3s.1-.3.3-.3H15c.2 0 .3.1.3.3s-.1.3-.3.3H6.4z"/>
+            </svg>
+          </td>
+          {% else -%}
           <td class="prev-article">&#8617;</td>
+          {% endif -%}
           <td class="menu">{{_("Menu")}}</td>
           <td class="next-article">&#8618;</td>
         </tr>
diff --git a/application/translations/messages.pot b/application/translations/messages.pot
index a2c57d2e..a5b8cbed 100644
--- a/application/translations/messages.pot
+++ b/application/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-06-03 20:15-0300\n"
+"POT-Creation-Date: 2024-06-09 21:53-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -220,8 +220,8 @@ msgid "Host"
 msgstr ""
 
 #: application/templates/adv_archive.html:119
+#: application/templates/adv_dict.html:79
 #: application/templates/adv_inboundmail.html:34
-#: application/templates/adv_reader.html:50
 #: application/templates/book_audiolator.html:113
 #: application/templates/book_translator.html:80
 #: application/templates/settings.html:256
@@ -243,27 +243,26 @@ msgid "Inbound Mail"
 msgstr ""
 
 #: application/templates/adv_base.html:66
-#: application/templates/adv_base.html:70
-#: application/templates/adv_import.html:8
-msgid "Import Feeds"
+#: application/templates/adv_base.html:70 application/templates/adv_dict.html:3
+#: application/templates/adv_dict.html:13 application/templates/reader.html:127
+msgid "Dictionary"
 msgstr ""
 
 #: application/templates/adv_base.html:75
 #: application/templates/adv_base.html:79
-msgid "Cover Image"
+#: application/templates/adv_import.html:8
+msgid "Import Feeds"
 msgstr ""
 
 #: application/templates/adv_base.html:84
 #: application/templates/adv_base.html:88
-#: application/templates/adv_uploadcss.html:3
-msgid "Stylesheet"
+msgid "Cover Image"
 msgstr ""
 
 #: application/templates/adv_base.html:93
 #: application/templates/adv_base.html:97
-#: application/templates/adv_reader.html:3 application/templates/base.html:182
-#: application/templates/reader.html:6
-msgid "Reader"
+#: application/templates/adv_uploadcss.html:3
+msgid "Stylesheet"
 msgstr ""
 
 #: application/templates/adv_base.html:102
@@ -309,6 +308,38 @@ msgstr ""
 msgid "Deliver"
 msgstr ""
 
+#: application/templates/adv_dict.html:15
+msgid "Set up dictionaries for online reading."
+msgstr ""
+
+#: application/templates/adv_dict.html:18
+#: application/templates/adv_dict.html:40
+#: application/templates/adv_dict.html:62
+msgid "Book language"
+msgstr ""
+
+#: application/templates/adv_dict.html:27
+#: application/templates/adv_dict.html:49
+#: application/templates/adv_dict.html:66
+#: application/templates/book_translator.html:26
+msgid "Engine"
+msgstr ""
+
+#: application/templates/adv_dict.html:33
+#: application/templates/adv_dict.html:55
+#: application/templates/adv_dict.html:72
+msgid "Database"
+msgstr ""
+
+#: application/templates/adv_dict.html:63
+msgid "Other languages"
+msgstr ""
+
+#: application/templates/adv_dict.html:84 application/view/reader.py:29
+#: application/view/reader.py:95
+msgid "Online reading feature has not been activated yet."
+msgstr ""
+
 #: application/templates/adv_import.html:3
 #: application/templates/adv_import.html:19
 msgid "Import"
@@ -393,75 +424,6 @@ msgstr ""
 msgid "Please input mail address"
 msgstr ""
 
-#: application/templates/adv_reader.html:18
-#: application/templates/reader.html:100
-msgid "Dictionary"
-msgstr ""
-
-#: application/templates/adv_reader.html:20
-msgid "Set up a dictionary for online reading."
-msgstr ""
-
-#: application/templates/adv_reader.html:23
-#: application/templates/book_translator.html:26
-msgid "Engine"
-msgstr ""
-
-#: application/templates/adv_reader.html:29
-#: application/templates/book_audiolator.html:41
-#: application/templates/book_translator.html:32
-msgid "Api Host"
-msgstr ""
-
-#: application/templates/adv_reader.html:33
-#: application/templates/book_audiolator.html:53
-#: application/templates/book_translator.html:36
-msgid "Api Key"
-msgstr ""
-
-#: application/templates/adv_reader.html:34
-#: application/templates/book_translator.html:37
-msgid "One key per line"
-msgstr ""
-
-#: application/templates/adv_reader.html:37
-#: application/templates/book_translator.html:40
-msgid "Source language"
-msgstr ""
-
-#: application/templates/adv_reader.html:43
-#: application/templates/book_translator.html:46
-msgid "Target language"
-msgstr ""
-
-#: application/templates/adv_reader.html:56
-#: application/templates/book_audiolator.html:119
-#: application/templates/book_translator.html:86
-msgid "Test (Please save settings firstly)"
-msgstr ""
-
-#: application/templates/adv_reader.html:58
-#: application/templates/book_audiolator.html:121
-#: application/templates/book_translator.html:88
-msgid "Text"
-msgstr ""
-
-#: application/templates/adv_reader.html:62
-#: application/templates/book_translator.html:92
-msgid "Translation"
-msgstr ""
-
-#: application/templates/adv_reader.html:67
-#: application/templates/book_audiolator.html:132
-#: application/templates/book_translator.html:97
-msgid "Test"
-msgstr ""
-
-#: application/templates/adv_reader.html:72 application/view/reader.py:30
-#: application/view/reader.py:93
-msgid "Online reading feature has not been activated yet."
-msgstr ""
-
 #: application/templates/adv_uploadcover.html:3
 msgid "Cover image"
 msgstr ""
@@ -516,7 +478,7 @@ msgstr ""
 msgid "Click to back"
 msgstr ""
 
-#: application/templates/base.html:24 application/templates/reader.html:153
+#: application/templates/base.html:24 application/templates/reader.html:181
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -552,7 +514,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: application/templates/base.html:34 application/templates/reader.html:154
+#: application/templates/base.html:34 application/templates/reader.html:182
 msgid "Are you sure to delete?"
 msgstr ""
 
@@ -600,7 +562,7 @@ msgstr ""
 msgid "Thank you for sharing."
 msgstr ""
 
-#: application/templates/base.html:46 application/templates/reader.html:125
+#: application/templates/base.html:46 application/templates/reader.html:152
 msgid "Close"
 msgstr ""
 
@@ -885,7 +847,7 @@ msgstr ""
 msgid "Please select a single item."
 msgstr ""
 
-#: application/templates/base.html:115 application/templates/reader.html:155
+#: application/templates/base.html:115 application/templates/reader.html:183
 msgid "Please select at least one item."
 msgstr ""
 
@@ -895,9 +857,8 @@ msgstr ""
 #: application/view/inbound_email.py:425 application/view/inbound_email.py:433
 #: application/view/inbound_email.py:448 application/view/inbound_email.py:469
 #: application/view/login.py:229 application/view/login.py:258
-#: application/view/reader.py:115 application/view/reader.py:132
-#: application/view/reader.py:174 application/view/settings.py:48
-#: application/view/share.py:37
+#: application/view/reader.py:118 application/view/reader.py:135
+#: application/view/settings.py:48 application/view/share.py:37
 msgid "Some parameters are missing or wrong."
 msgstr ""
 
@@ -982,6 +943,10 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
+#: application/templates/base.html:182 application/templates/reader.html:6
+msgid "Reader"
+msgstr ""
+
 #: application/templates/book_audiolator.html:22
 #: application/templates/book_translator.html:19
 msgid "State"
@@ -1011,6 +976,11 @@ msgstr ""
 msgid "TTS Engine"
 msgstr ""
 
+#: application/templates/book_audiolator.html:41
+#: application/templates/book_translator.html:32
+msgid "Api Host"
+msgstr ""
+
 #: application/templates/book_audiolator.html:42
 msgid "Empty to use default endpoint"
 msgstr ""
@@ -1019,6 +989,11 @@ msgstr ""
 msgid "Region"
 msgstr ""
 
+#: application/templates/book_audiolator.html:53
+#: application/templates/book_translator.html:36
+msgid "Api Key"
+msgstr ""
+
 #: application/templates/book_audiolator.html:66
 msgid "Voice name"
 msgstr ""
@@ -1101,14 +1076,41 @@ msgid ""
 "instance hours."
 msgstr ""
 
+#: application/templates/book_audiolator.html:119
+#: application/templates/book_translator.html:86
+msgid "Test (Please save settings firstly)"
+msgstr ""
+
+#: application/templates/book_audiolator.html:121
+#: application/templates/book_translator.html:88
+msgid "Text"
+msgstr ""
+
 #: application/templates/book_audiolator.html:127
 msgid "Your browser does not support the audio element."
 msgstr ""
 
+#: application/templates/book_audiolator.html:132
+#: application/templates/book_translator.html:97
+msgid "Test"
+msgstr ""
+
 #: application/templates/book_translator.html:21
 msgid "Enable"
 msgstr ""
 
+#: application/templates/book_translator.html:37
+msgid "One key per line"
+msgstr ""
+
+#: application/templates/book_translator.html:40
+msgid "Source language"
+msgstr ""
+
+#: application/templates/book_translator.html:46
+msgid "Target language"
+msgstr ""
+
 #: application/templates/book_translator.html:52
 msgid "Translation Position"
 msgstr ""
@@ -1141,6 +1143,10 @@ msgstr ""
 msgid "Translated text style"
 msgstr ""
 
+#: application/templates/book_translator.html:92
+msgid "Translation"
+msgstr ""
+
 #: application/templates/change_password.html:15
 msgid "Old password"
 msgstr ""
@@ -1242,6 +1248,10 @@ msgstr ""
 msgid "Library"
 msgstr ""
 
+#: application/templates/my.html:51
+msgid "get more recipes"
+msgstr ""
+
 #: application/templates/my.html:68
 msgid "Subscription to selected recipe successful."
 msgstr ""
@@ -1274,70 +1284,74 @@ msgstr ""
 msgid "Browser extensions also available"
 msgstr ""
 
-#: application/templates/reader.html:37
+#: application/templates/reader.html:57
 msgid "Push current book"
 msgstr ""
 
-#: application/templates/reader.html:43
+#: application/templates/reader.html:63
 msgid "Push current article"
 msgstr ""
 
-#: application/templates/reader.html:49
+#: application/templates/reader.html:71
 msgid "Delete selected books"
 msgstr ""
 
-#: application/templates/reader.html:55
+#: application/templates/reader.html:77
 msgid "Allow click links"
 msgstr ""
 
-#: application/templates/reader.html:61
+#: application/templates/reader.html:82
+msgid "Top-left dict mode"
+msgstr ""
+
+#: application/templates/reader.html:88
 msgid "eInk mode"
 msgstr ""
 
-#: application/templates/reader.html:67
+#: application/templates/reader.html:94
 msgid "Increase font size"
 msgstr ""
 
-#: application/templates/reader.html:73
+#: application/templates/reader.html:100
 msgid "Decrease font size"
 msgstr ""
 
-#: application/templates/reader.html:79
+#: application/templates/reader.html:106
 msgid "Visualize Touch Regions"
 msgstr ""
 
-#: application/templates/reader.html:85
+#: application/templates/reader.html:112
 msgid "Help"
 msgstr ""
 
-#: application/templates/reader.html:91
-#: application/templates/reader_404.html:125
+#: application/templates/reader.html:118
+#: application/templates/reader_404.html:135
 msgid "Menu"
 msgstr ""
 
-#: application/templates/reader.html:105
+#: application/templates/reader.html:132
 msgid "Collapse all"
 msgstr ""
 
-#: application/templates/reader.html:110
+#: application/templates/reader.html:137
 msgid "Expand all"
 msgstr ""
 
-#: application/templates/reader.html:115
-#: application/templates/reader_404.html:130
+#: application/templates/reader.html:142
+#: application/templates/reader_404.html:140
 msgid "Prev"
 msgstr ""
 
-#: application/templates/reader.html:120
-#: application/templates/reader_404.html:133
+#: application/templates/reader.html:147
+#: application/templates/reader_404.html:143
 msgid "Next page"
 msgstr ""
 
-#: application/templates/reader.html:156
+#: application/templates/reader.html:184
 msgid "Pushed successfully."
 msgstr ""
 
-#: application/templates/reader.html:157
+#: application/templates/reader.html:185
 msgid "There are currently no books or articles being read."
 msgstr ""
 
@@ -1560,9 +1574,9 @@ msgstr ""
 msgid "Fwd as Attach"
 msgstr ""
 
-#: application/view/admin.py:48 application/view/adv.py:410
-#: application/view/adv.py:454 application/view/settings.py:76
-#: application/view/translator.py:83 application/view/translator.py:167
+#: application/view/admin.py:48 application/view/adv.py:425
+#: application/view/settings.py:76 application/view/translator.py:83
+#: application/view/translator.py:167
 msgid "Settings Saved!"
 msgstr ""
 
@@ -1616,103 +1630,93 @@ msgstr ""
 msgid "The old password is wrong."
 msgstr ""
 
-#: application/view/adv.py:94 application/view/adv.py:95
-#: application/view/adv.py:96 application/view/adv.py:97
-#: application/view/adv.py:98 application/view/adv.py:99
-#: application/view/adv.py:100 application/view/adv.py:101
-#: application/view/adv.py:102 application/view/adv.py:103
+#: application/view/adv.py:93 application/view/adv.py:94
+#: application/view/adv.py:95 application/view/adv.py:96
+#: application/view/adv.py:97 application/view/adv.py:98
+#: application/view/adv.py:99 application/view/adv.py:100
+#: application/view/adv.py:101 application/view/adv.py:102
 msgid "Append hyperlink '{}' to article"
 msgstr ""
 
-#: application/view/adv.py:94 application/view/adv.py:95
-#: application/view/adv.py:96 application/view/adv.py:97
-#: application/view/adv.py:98
+#: application/view/adv.py:93 application/view/adv.py:94
+#: application/view/adv.py:95 application/view/adv.py:96
+#: application/view/adv.py:97
 msgid "Save to {}"
 msgstr ""
 
-#: application/view/adv.py:94
+#: application/view/adv.py:93
 msgid "evernote"
 msgstr ""
 
-#: application/view/adv.py:95
+#: application/view/adv.py:94
 msgid "wiz"
 msgstr ""
 
-#: application/view/adv.py:96
+#: application/view/adv.py:95
 msgid "pocket"
 msgstr ""
 
-#: application/view/adv.py:97
+#: application/view/adv.py:96
 msgid "instapaper"
 msgstr ""
 
-#: application/view/adv.py:98
+#: application/view/adv.py:97
 msgid "wallabag"
 msgstr ""
 
-#: application/view/adv.py:99 application/view/adv.py:100
-#: application/view/adv.py:101 application/view/adv.py:102
+#: application/view/adv.py:98 application/view/adv.py:99
+#: application/view/adv.py:100 application/view/adv.py:101
 msgid "Share on {}"
 msgstr ""
 
-#: application/view/adv.py:99
+#: application/view/adv.py:98
 msgid "weibo"
 msgstr ""
 
-#: application/view/adv.py:100
+#: application/view/adv.py:99
 msgid "facebook"
 msgstr ""
 
-#: application/view/adv.py:102
+#: application/view/adv.py:101
 msgid "tumblr"
 msgstr ""
 
-#: application/view/adv.py:103
+#: application/view/adv.py:102
 msgid "Open in browser"
 msgstr ""
 
-#: application/view/adv.py:104
+#: application/view/adv.py:103
 msgid "Append qrcode of url to article"
 msgstr ""
 
-#: application/view/adv.py:368 application/view/share.py:54
+#: application/view/adv.py:367 application/view/share.py:54
 #: application/view/subscribe.py:247
 msgid "Unknown command: {}"
 msgstr ""
 
-#: application/view/adv.py:399 application/view/translator.py:77
-#: application/view/translator.py:160
-msgid "The api key is required."
-msgstr ""
-
-#: application/view/adv.py:420 application/view/translator.py:116
-#: application/view/translator.py:200
-msgid "The text is empty."
-msgstr ""
-
-#: application/view/adv.py:456
+#: application/view/adv.py:427
 msgid "The format is invalid."
 msgstr ""
 
-#: application/view/adv.py:488
+#: application/view/adv.py:459
 msgid "Authorization Error!<br/>{}"
 msgstr ""
 
-#: application/view/adv.py:509
+#: application/view/adv.py:480
 msgid "Success authorized by Pocket!"
 msgstr ""
 
-#: application/view/adv.py:515
+#: application/view/adv.py:486
 msgid ""
 "Failed to request authorization of Pocket!<hr/>See details "
 "below:<br/><br/>{}"
 msgstr ""
 
-#: application/view/adv.py:536
+#: application/view/adv.py:507
 msgid "The Instapaper service encountered an error. Please try again later."
 msgstr ""
 
-#: application/view/adv.py:549
+#: application/view/adv.py:520
 msgid "Request type [{}] unsupported"
 msgstr ""
 
@@ -1813,15 +1817,20 @@ msgstr ""
 msgid "You can click the following link to reset your KindleEar password."
 msgstr ""
 
-#: application/view/reader.py:95
+#: application/view/reader.py:97
 msgid "The article is missing?"
 msgstr ""
 
-#: application/view/reader.py:192
+#: application/view/reader.py:180 application/view/translator.py:116
+#: application/view/translator.py:200
+msgid "The text is empty."
+msgstr ""
+
+#: application/view/reader.py:274
 msgid "Failed to push: {}"
 msgstr ""
 
-#: application/view/reader.py:240
+#: application/view/reader.py:322
 msgid "Failed to create ebook."
 msgstr ""
 
@@ -1834,11 +1843,11 @@ msgid "Title is requied!"
 msgstr ""
 
 #: application/view/settings.py:174
-msgid "Chinese"
+msgid "English"
 msgstr ""
 
 #: application/view/settings.py:175
-msgid "English"
+msgid "Chinese"
 msgstr ""
 
 #: application/view/settings.py:176
@@ -1937,6 +1946,70 @@ msgstr ""
 msgid "Hausa"
 msgstr ""
 
+#: application/view/settings.py:200
+msgid "Thai"
+msgstr ""
+
+#: application/view/settings.py:201
+msgid "Polish"
+msgstr ""
+
+#: application/view/settings.py:202
+msgid "Romanian"
+msgstr ""
+
+#: application/view/settings.py:203
+msgid "Hungarian"
+msgstr ""
+
+#: application/view/settings.py:204
+msgid "Swedish"
+msgstr ""
+
+#: application/view/settings.py:205
+msgid "Hebrew"
+msgstr ""
+
+#: application/view/settings.py:206
+msgid "Norwegian"
+msgstr ""
+
+#: application/view/settings.py:207
+msgid "Finnish"
+msgstr ""
+
+#: application/view/settings.py:208
+msgid "Danish"
+msgstr ""
+
+#: application/view/settings.py:209
+msgid "Ukrainian"
+msgstr ""
+
+#: application/view/settings.py:210
+msgid "Tamil"
+msgstr ""
+
+#: application/view/settings.py:211
+msgid "Marathi"
+msgstr ""
+
+#: application/view/settings.py:212
+msgid "Burmese"
+msgstr ""
+
+#: application/view/settings.py:213
+msgid "Amharic"
+msgstr ""
+
+#: application/view/settings.py:214
+msgid "Azerbaijani"
+msgstr ""
+
+#: application/view/settings.py:215
+msgid "Kazakh"
+msgstr ""
+
 #: application/view/share.py:60
 msgid "There is no {} email yet."
 msgstr ""
@@ -2029,3 +2102,7 @@ msgstr ""
 msgid "The login information for this recipe has been saved."
 msgstr ""
 
+#: application/view/translator.py:77 application/view/translator.py:160
+msgid "The api key is required."
+msgstr ""
+
diff --git a/application/translations/tr_TR/LC_MESSAGES/messages.mo b/application/translations/tr_TR/LC_MESSAGES/messages.mo
index 4f83a69c3fc4ee8b4c845701483c66cbca06f20a..9831f4787a9f223036e2a32517d1c69d0abcb482 100644
GIT binary patch
delta 8328
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
D+ZRrI

delta 7636
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
SJ&Ab_yz%*!exA-#M*kPGd80o7

diff --git a/application/translations/tr_TR/LC_MESSAGES/messages.po b/application/translations/tr_TR/LC_MESSAGES/messages.po
index 219bb8b1..313952a0 100644
--- a/application/translations/tr_TR/LC_MESSAGES/messages.po
+++ b/application/translations/tr_TR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-06-03 20:15-0300\n"
+"POT-Creation-Date: 2024-06-09 21:53-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: tr_TR\n"
@@ -221,8 +221,8 @@ msgid "Host"
 msgstr "Ana bilgisayar"
 
 #: application/templates/adv_archive.html:119
+#: application/templates/adv_dict.html:79
 #: application/templates/adv_inboundmail.html:34
-#: application/templates/adv_reader.html:50
 #: application/templates/book_audiolator.html:113
 #: application/templates/book_translator.html:80
 #: application/templates/settings.html:256
@@ -244,29 +244,28 @@ msgid "Inbound Mail"
 msgstr "Gelen Posta"
 
 #: application/templates/adv_base.html:66
-#: application/templates/adv_base.html:70
+#: application/templates/adv_base.html:70 application/templates/adv_dict.html:3
+#: application/templates/adv_dict.html:13 application/templates/reader.html:127
+msgid "Dictionary"
+msgstr "Sözlük"
+
+#: application/templates/adv_base.html:75
+#: application/templates/adv_base.html:79
 #: application/templates/adv_import.html:8
 msgid "Import Feeds"
 msgstr "feedleri içeri aktar"
 
-#: application/templates/adv_base.html:75
-#: application/templates/adv_base.html:79
+#: application/templates/adv_base.html:84
+#: application/templates/adv_base.html:88
 msgid "Cover Image"
 msgstr "Kapak resmi"
 
-#: application/templates/adv_base.html:84
-#: application/templates/adv_base.html:88
+#: application/templates/adv_base.html:93
+#: application/templates/adv_base.html:97
 #: application/templates/adv_uploadcss.html:3
 msgid "Stylesheet"
 msgstr "Stylesheet"
 
-#: application/templates/adv_base.html:93
-#: application/templates/adv_base.html:97
-#: application/templates/adv_reader.html:3 application/templates/base.html:182
-#: application/templates/reader.html:6
-msgid "Reader"
-msgstr "Okuyucu"
-
 #: application/templates/adv_base.html:102
 #: application/templates/adv_base.html:106
 #: application/templates/adv_calibre_options.html:12
@@ -310,6 +309,38 @@ msgstr "Hiçbirini seçme"
 msgid "Deliver"
 msgstr "Şimdi gönder"
 
+#: application/templates/adv_dict.html:15
+msgid "Set up dictionaries for online reading."
+msgstr "Online okuma için sözlükleri kurun."
+
+#: application/templates/adv_dict.html:18
+#: application/templates/adv_dict.html:40
+#: application/templates/adv_dict.html:62
+msgid "Book language"
+msgstr "Kitap dili"
+
+#: application/templates/adv_dict.html:27
+#: application/templates/adv_dict.html:49
+#: application/templates/adv_dict.html:66
+#: application/templates/book_translator.html:26
+msgid "Engine"
+msgstr "Motor"
+
+#: application/templates/adv_dict.html:33
+#: application/templates/adv_dict.html:55
+#: application/templates/adv_dict.html:72
+msgid "Database"
+msgstr "Veritabanı"
+
+#: application/templates/adv_dict.html:63
+msgid "Other languages"
+msgstr "Diğer diller"
+
+#: application/templates/adv_dict.html:84 application/view/reader.py:29
+#: application/view/reader.py:95
+msgid "Online reading feature has not been activated yet."
+msgstr "Çevrimiçi okuma özelliği henüz etkinleştirilmedi."
+
 #: application/templates/adv_import.html:3
 #: application/templates/adv_import.html:19
 msgid "Import"
@@ -398,75 +429,6 @@ msgstr "Örnek"
 msgid "Please input mail address"
 msgstr "Lütfen e-posta adresini giriniz"
 
-#: application/templates/adv_reader.html:18
-#: application/templates/reader.html:100
-msgid "Dictionary"
-msgstr "Sözlük"
-
-#: application/templates/adv_reader.html:20
-msgid "Set up a dictionary for online reading."
-msgstr "Çevrimiçi okuma için bir sözlük kurun."
-
-#: application/templates/adv_reader.html:23
-#: application/templates/book_translator.html:26
-msgid "Engine"
-msgstr "Motor"
-
-#: application/templates/adv_reader.html:29
-#: application/templates/book_audiolator.html:41
-#: application/templates/book_translator.html:32
-msgid "Api Host"
-msgstr "Api Host"
-
-#: application/templates/adv_reader.html:33
-#: application/templates/book_audiolator.html:53
-#: application/templates/book_translator.html:36
-msgid "Api Key"
-msgstr "Api Key"
-
-#: application/templates/adv_reader.html:34
-#: application/templates/book_translator.html:37
-msgid "One key per line"
-msgstr "Satır başına bir tuş"
-
-#: application/templates/adv_reader.html:37
-#: application/templates/book_translator.html:40
-msgid "Source language"
-msgstr "Kaynak dil"
-
-#: application/templates/adv_reader.html:43
-#: application/templates/book_translator.html:46
-msgid "Target language"
-msgstr "Hedef dil"
-
-#: application/templates/adv_reader.html:56
-#: application/templates/book_audiolator.html:119
-#: application/templates/book_translator.html:86
-msgid "Test (Please save settings firstly)"
-msgstr "Test (Lütfen önce ayarları kaydedin)"
-
-#: application/templates/adv_reader.html:58
-#: application/templates/book_audiolator.html:121
-#: application/templates/book_translator.html:88
-msgid "Text"
-msgstr "Metin"
-
-#: application/templates/adv_reader.html:62
-#: application/templates/book_translator.html:92
-msgid "Translation"
-msgstr "Çeviri"
-
-#: application/templates/adv_reader.html:67
-#: application/templates/book_audiolator.html:132
-#: application/templates/book_translator.html:97
-msgid "Test"
-msgstr "Test"
-
-#: application/templates/adv_reader.html:72 application/view/reader.py:30
-#: application/view/reader.py:93
-msgid "Online reading feature has not been activated yet."
-msgstr "Çevrimiçi okuma özelliği henüz etkinleştirilmedi."
-
 #: application/templates/adv_uploadcover.html:3
 msgid "Cover image"
 msgstr "Kapak resmi"
@@ -523,7 +485,7 @@ msgstr "5 saniye sonra otomatik olarak önceki sayfaya döneceksiniz."
 msgid "Click to back"
 msgstr "Geri dönmek için tıklayınız"
 
-#: application/templates/base.html:24 application/templates/reader.html:153
+#: application/templates/base.html:24 application/templates/reader.html:181
 msgid "Confirm Deletion"
 msgstr "Silmeyi Onayla"
 
@@ -559,7 +521,7 @@ msgstr "Tam Metin"
 msgid "Share"
 msgstr "Paylaş"
 
-#: application/templates/base.html:34 application/templates/reader.html:154
+#: application/templates/base.html:34 application/templates/reader.html:182
 msgid "Are you sure to delete?"
 msgstr "Silmek istediğinizden emin misiniz?"
 
@@ -607,7 +569,7 @@ msgstr "Dil kodu geçersiz"
 msgid "Thank you for sharing."
 msgstr "Paylaştığınız için teşekkür ederiz."
 
-#: application/templates/base.html:46 application/templates/reader.html:125
+#: application/templates/base.html:46 application/templates/reader.html:152
 msgid "Close"
 msgstr "Kapat"
 
@@ -901,7 +863,7 @@ msgstr "Burada hiçbir şey yok."
 msgid "Please select a single item."
 msgstr "Lütfen tek bir öğe seçin."
 
-#: application/templates/base.html:115 application/templates/reader.html:155
+#: application/templates/base.html:115 application/templates/reader.html:183
 msgid "Please select at least one item."
 msgstr "Lütfen en az bir öğe seçin."
 
@@ -911,9 +873,8 @@ msgstr "Lütfen en az bir öğe seçin."
 #: application/view/inbound_email.py:425 application/view/inbound_email.py:433
 #: application/view/inbound_email.py:448 application/view/inbound_email.py:469
 #: application/view/login.py:229 application/view/login.py:258
-#: application/view/reader.py:115 application/view/reader.py:132
-#: application/view/reader.py:174 application/view/settings.py:48
-#: application/view/share.py:37
+#: application/view/reader.py:118 application/view/reader.py:135
+#: application/view/settings.py:48 application/view/share.py:37
 msgid "Some parameters are missing or wrong."
 msgstr "Bazı parametreler eksik veya yanlış."
 
@@ -998,6 +959,10 @@ msgstr "Gelişmiş"
 msgid "Shared"
 msgstr "Paylaşılan"
 
+#: application/templates/base.html:182 application/templates/reader.html:6
+msgid "Reader"
+msgstr "Okuyucu"
+
 #: application/templates/book_audiolator.html:22
 #: application/templates/book_translator.html:19
 msgid "State"
@@ -1027,6 +992,11 @@ msgstr "Kindle_email kullanmak için boş bırakın"
 msgid "TTS Engine"
 msgstr "TTS Motoru"
 
+#: application/templates/book_audiolator.html:41
+#: application/templates/book_translator.html:32
+msgid "Api Host"
+msgstr "Api Host"
+
 #: application/templates/book_audiolator.html:42
 msgid "Empty to use default endpoint"
 msgstr "Varsayılan uç noktayı kullanmak için boş bırakın"
@@ -1035,6 +1005,11 @@ msgstr "Varsayılan uç noktayı kullanmak için boş bırakın"
 msgid "Region"
 msgstr "Bölge"
 
+#: application/templates/book_audiolator.html:53
+#: application/templates/book_translator.html:36
+msgid "Api Key"
+msgstr "Api Key"
+
 #: application/templates/book_audiolator.html:66
 msgid "Voice name"
 msgstr "Ses adı"
@@ -1119,14 +1094,41 @@ msgstr ""
 "Not: Bu özelliği etkinleştirmek, kullanılan CPU örnek saatlerini önemli "
 "ölçüde artırır."
 
+#: application/templates/book_audiolator.html:119
+#: application/templates/book_translator.html:86
+msgid "Test (Please save settings firstly)"
+msgstr "Test (Lütfen önce ayarları kaydedin)"
+
+#: application/templates/book_audiolator.html:121
+#: application/templates/book_translator.html:88
+msgid "Text"
+msgstr "Metin"
+
 #: application/templates/book_audiolator.html:127
 msgid "Your browser does not support the audio element."
 msgstr "Tarayıcınız ses öğesini desteklemiyor."
 
+#: application/templates/book_audiolator.html:132
+#: application/templates/book_translator.html:97
+msgid "Test"
+msgstr "Test"
+
 #: application/templates/book_translator.html:21
 msgid "Enable"
 msgstr "Etkinleştir"
 
+#: application/templates/book_translator.html:37
+msgid "One key per line"
+msgstr "Satır başına bir tuş"
+
+#: application/templates/book_translator.html:40
+msgid "Source language"
+msgstr "Kaynak dil"
+
+#: application/templates/book_translator.html:46
+msgid "Target language"
+msgstr "Hedef dil"
+
 #: application/templates/book_translator.html:52
 msgid "Translation Position"
 msgstr "Çeviri Konumu"
@@ -1159,6 +1161,10 @@ msgstr "Orijinal metin stili"
 msgid "Translated text style"
 msgstr "Çevrilmiş metin stili"
 
+#: application/templates/book_translator.html:92
+msgid "Translation"
+msgstr "Çeviri"
+
 #: application/templates/change_password.html:15
 msgid "Old password"
 msgstr "Eski şifre"
@@ -1269,6 +1275,10 @@ msgstr "Abone olundu"
 msgid "Library"
 msgstr "Kütüphane"
 
+#: application/templates/my.html:51
+msgid "get more recipes"
+msgstr "daha fazla tarif alın"
+
 #: application/templates/my.html:68
 msgid "Subscription to selected recipe successful."
 msgstr "Seçilen tarife abonelik başarılı."
@@ -1301,70 +1311,74 @@ msgstr "Edge eklentisi"
 msgid "Browser extensions also available"
 msgstr "Tarayıcı eklentileri de mevcut"
 
-#: application/templates/reader.html:37
+#: application/templates/reader.html:57
 msgid "Push current book"
 msgstr "Şu anki kitabı gönder"
 
-#: application/templates/reader.html:43
+#: application/templates/reader.html:63
 msgid "Push current article"
 msgstr "Şu anki makaleyi gönder"
 
-#: application/templates/reader.html:49
+#: application/templates/reader.html:71
 msgid "Delete selected books"
 msgstr "Seçili kitapları sil"
 
-#: application/templates/reader.html:55
+#: application/templates/reader.html:77
 msgid "Allow click links"
 msgstr "Bağlantıları tıklamaya izin ver"
 
-#: application/templates/reader.html:61
+#: application/templates/reader.html:82
+msgid "Top-left dict mode"
+msgstr "Üst sol sözlük modu"
+
+#: application/templates/reader.html:88
 msgid "eInk mode"
 msgstr "eInk modu"
 
-#: application/templates/reader.html:67
+#: application/templates/reader.html:94
 msgid "Increase font size"
 msgstr "Yazı tipi boyutunu artır"
 
-#: application/templates/reader.html:73
+#: application/templates/reader.html:100
 msgid "Decrease font size"
 msgstr "Yazı tipi boyutunu azalt"
 
-#: application/templates/reader.html:79
+#: application/templates/reader.html:106
 msgid "Visualize Touch Regions"
 msgstr "Dokunma bölgelerini görselleştir"
 
-#: application/templates/reader.html:85
+#: application/templates/reader.html:112
 msgid "Help"
 msgstr "Yardım"
 
-#: application/templates/reader.html:91
-#: application/templates/reader_404.html:125
+#: application/templates/reader.html:118
+#: application/templates/reader_404.html:135
 msgid "Menu"
 msgstr "Menü"
 
-#: application/templates/reader.html:105
+#: application/templates/reader.html:132
 msgid "Collapse all"
 msgstr "Tümünü daralt"
 
-#: application/templates/reader.html:110
+#: application/templates/reader.html:137
 msgid "Expand all"
 msgstr "Tümünü genişlet"
 
-#: application/templates/reader.html:115
-#: application/templates/reader_404.html:130
+#: application/templates/reader.html:142
+#: application/templates/reader_404.html:140
 msgid "Prev"
 msgstr "Önceki"
 
-#: application/templates/reader.html:120
-#: application/templates/reader_404.html:133
+#: application/templates/reader.html:147
+#: application/templates/reader_404.html:143
 msgid "Next page"
 msgstr "Sonraki sayfa"
 
-#: application/templates/reader.html:156
+#: application/templates/reader.html:184
 msgid "Pushed successfully."
 msgstr "Başarıyla itildi"
 
-#: application/templates/reader.html:157
+#: application/templates/reader.html:185
 msgid "There are currently no books or articles being read."
 msgstr "Şu anda okunan herhangi bir kitap veya makale bulunmamaktadır."
 
@@ -1594,9 +1608,9 @@ msgstr "İlet"
 msgid "Fwd as Attach"
 msgstr "Ek olarak ilet"
 
-#: application/view/admin.py:48 application/view/adv.py:410
-#: application/view/adv.py:454 application/view/settings.py:76
-#: application/view/translator.py:83 application/view/translator.py:167
+#: application/view/admin.py:48 application/view/adv.py:425
+#: application/view/settings.py:76 application/view/translator.py:83
+#: application/view/translator.py:167
 msgid "Settings Saved!"
 msgstr "Ayarlar Kaydedildi!"
 
@@ -1650,93 +1664,83 @@ msgstr "Değişiklikler başarıyla kaydedildi."
 msgid "The old password is wrong."
 msgstr "Eski şifre yanlış."
 
-#: application/view/adv.py:94 application/view/adv.py:95
-#: application/view/adv.py:96 application/view/adv.py:97
-#: application/view/adv.py:98 application/view/adv.py:99
-#: application/view/adv.py:100 application/view/adv.py:101
-#: application/view/adv.py:102 application/view/adv.py:103
+#: application/view/adv.py:93 application/view/adv.py:94
+#: application/view/adv.py:95 application/view/adv.py:96
+#: application/view/adv.py:97 application/view/adv.py:98
+#: application/view/adv.py:99 application/view/adv.py:100
+#: application/view/adv.py:101 application/view/adv.py:102
 msgid "Append hyperlink '{}' to article"
 msgstr "'{}' linkini makaleye ekle"
 
-#: application/view/adv.py:94 application/view/adv.py:95
-#: application/view/adv.py:96 application/view/adv.py:97
-#: application/view/adv.py:98
+#: application/view/adv.py:93 application/view/adv.py:94
+#: application/view/adv.py:95 application/view/adv.py:96
+#: application/view/adv.py:97
 msgid "Save to {}"
 msgstr "{} kaydedildi"
 
-#: application/view/adv.py:94
+#: application/view/adv.py:93
 msgid "evernote"
 msgstr "evernote"
 
-#: application/view/adv.py:95
+#: application/view/adv.py:94
 msgid "wiz"
 msgstr "wiz"
 
-#: application/view/adv.py:96
+#: application/view/adv.py:95
 msgid "pocket"
 msgstr "pocket"
 
-#: application/view/adv.py:97
+#: application/view/adv.py:96
 msgid "instapaper"
 msgstr "instapaper"
 
-#: application/view/adv.py:98
+#: application/view/adv.py:97
 msgid "wallabag"
 msgstr "wallabag"
 
-#: application/view/adv.py:99 application/view/adv.py:100
-#: application/view/adv.py:101 application/view/adv.py:102
+#: application/view/adv.py:98 application/view/adv.py:99
+#: application/view/adv.py:100 application/view/adv.py:101
 msgid "Share on {}"
 msgstr "{} üzerinde paylaş"
 
-#: application/view/adv.py:99
+#: application/view/adv.py:98
 msgid "weibo"
 msgstr "weibo"
 
-#: application/view/adv.py:100
+#: application/view/adv.py:99
 msgid "facebook"
 msgstr "facebook"
 
-#: application/view/adv.py:102
+#: application/view/adv.py:101
 msgid "tumblr"
 msgstr "tumblr"
 
-#: application/view/adv.py:103
+#: application/view/adv.py:102
 msgid "Open in browser"
 msgstr "Tarayıcıda aç"
 
-#: application/view/adv.py:104
+#: application/view/adv.py:103
 msgid "Append qrcode of url to article"
 msgstr "Makaleye URL'nin QR kodunu ekle"
 
-#: application/view/adv.py:368 application/view/share.py:54
+#: application/view/adv.py:367 application/view/share.py:54
 #: application/view/subscribe.py:247
 msgid "Unknown command: {}"
 msgstr "Bilinmeyen komut: {}"
 
-#: application/view/adv.py:399 application/view/translator.py:77
-#: application/view/translator.py:160
-msgid "The api key is required."
-msgstr "API anahtarı gereklidir."
-
-#: application/view/adv.py:420 application/view/translator.py:116
-#: application/view/translator.py:200
-msgid "The text is empty."
-msgstr "Metin boş."
-
-#: application/view/adv.py:456
+#: application/view/adv.py:427
 msgid "The format is invalid."
 msgstr "Format geçersiz."
 
-#: application/view/adv.py:488
+#: application/view/adv.py:459
 msgid "Authorization Error!<br/>{}"
 msgstr "Yetkilendirme Hatası!<br/>{}"
 
-#: application/view/adv.py:509
+#: application/view/adv.py:480
 msgid "Success authorized by Pocket!"
 msgstr "Pocket tarafından yetkilendirilen başarı!"
 
-#: application/view/adv.py:515
+#: application/view/adv.py:486
 msgid ""
 "Failed to request authorization of Pocket!<hr/>See details "
 "below:<br/><br/>{}"
@@ -1744,13 +1748,13 @@ msgstr ""
 "Pocket yetkilendirme isteği başarısız oldu!<hr/>Aşağıdaki ayrıntılara "
 "bakın:<br/><br/>{}"
 
-#: application/view/adv.py:536
+#: application/view/adv.py:507
 msgid "The Instapaper service encountered an error. Please try again later."
 msgstr ""
 "Instapaper servisi bir hata ile karşılaştı. Lütfen daha sonra tekrar "
 "deneyin."
 
-#: application/view/adv.py:549
+#: application/view/adv.py:520
 msgid "Request type [{}] unsupported"
 msgstr "İstek türü [{}] desteklenmiyor"
 
@@ -1857,15 +1861,20 @@ msgstr ""
 "KindleEar şifrenizi sıfırlamak için aşağıdaki bağlantıya "
 "tıklayabilirsiniz."
 
-#: application/view/reader.py:95
+#: application/view/reader.py:97
 msgid "The article is missing?"
 msgstr "Makale eksik mi?"
 
-#: application/view/reader.py:192
+#: application/view/reader.py:180 application/view/translator.py:116
+#: application/view/translator.py:200
+msgid "The text is empty."
+msgstr "Metin boş."
+
+#: application/view/reader.py:274
 msgid "Failed to push: {}"
 msgstr "İtilemedi: {}"
 
-#: application/view/reader.py:240
+#: application/view/reader.py:322
 msgid "Failed to create ebook."
 msgstr "E-kitap oluşturulamadı."
 
@@ -1878,13 +1887,13 @@ msgid "Title is requied!"
 msgstr "Başlık zorunlu!"
 
 #: application/view/settings.py:174
-msgid "Chinese"
-msgstr "Çince"
-
-#: application/view/settings.py:175
 msgid "English"
 msgstr "İngilizce"
 
+#: application/view/settings.py:175
+msgid "Chinese"
+msgstr "Çince"
+
 #: application/view/settings.py:176
 msgid "French"
 msgstr "Fransızca"
@@ -1981,6 +1990,70 @@ msgstr "Tagalog"
 msgid "Hausa"
 msgstr "Hausa"
 
+#: application/view/settings.py:200
+msgid "Thai"
+msgstr "Taylandca"
+
+#: application/view/settings.py:201
+msgid "Polish"
+msgstr "Lehçe"
+
+#: application/view/settings.py:202
+msgid "Romanian"
+msgstr "Rumen"
+
+#: application/view/settings.py:203
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: application/view/settings.py:204
+msgid "Swedish"
+msgstr "İsveççe"
+
+#: application/view/settings.py:205
+msgid "Hebrew"
+msgstr "İbranice"
+
+#: application/view/settings.py:206
+msgid "Norwegian"
+msgstr "Norveççe"
+
+#: application/view/settings.py:207
+msgid "Finnish"
+msgstr "Fince"
+
+#: application/view/settings.py:208
+msgid "Danish"
+msgstr "Danca"
+
+#: application/view/settings.py:209
+msgid "Ukrainian"
+msgstr "Ukraynaca"
+
+#: application/view/settings.py:210
+msgid "Tamil"
+msgstr "Tamilce"
+
+#: application/view/settings.py:211
+msgid "Marathi"
+msgstr "Marathi"
+
+#: application/view/settings.py:212
+msgid "Burmese"
+msgstr "Burmaca"
+
+#: application/view/settings.py:213
+msgid "Amharic"
+msgstr "Amharca"
+
+#: application/view/settings.py:214
+msgid "Azerbaijani"
+msgstr "Azerbaycanca"
+
+#: application/view/settings.py:215
+msgid "Kazakh"
+msgstr "Kazakça"
+
 #: application/view/share.py:60
 msgid "There is no {} email yet."
 msgstr "Henüz {} e-postası bulunmamaktadır."
@@ -2075,3 +2148,7 @@ msgstr "Bu tarifin giriş bilgileri temizlendi."
 msgid "The login information for this recipe has been saved."
 msgstr "Bu tarifin giriş bilgileri kaydedildi."
 
+#: application/view/translator.py:77 application/view/translator.py:160
+msgid "The api key is required."
+msgstr "API anahtarı gereklidir."
+
diff --git a/application/translations/zh/LC_MESSAGES/messages.mo b/application/translations/zh/LC_MESSAGES/messages.mo
index a0e16dc40f40485210abc8d81c0bbf35cfb09395..92db23f156d825fb58a676e1c9a587fba0380eec 100644
GIT binary patch
delta 8322
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

delta 7592
zcmYM%cXU-%7RT}X5&|g%0-=Wz2oPEbgl4ExLJ1N=lNy-NLWYhoN^!11nzS)Islo^g
z>21M76sal^MH!{3un=%Tj0L4L8U*J1<L<S_Km43??kW51bMDRK)J5Mr=X~y!(nXd#
z{CC3VIF+$=3Dy4p-w+x@sAga>9Dzk~tU1Nnr&~P-LwUZy+H<XawYlEhg7kBp-PZ6v
zYVD(_g-&A(UO-KF2eoh^2BWWv<3wNxD!@{xe&w+g#-he2S$i64-u|e0hG8u0JEJMo
zr(r%;!+?1X)$tx`U?H}}psJ3OfbFq1PQ)6x0?Xq;jKnjj0Ip&fKEiMeVG-4%upa9>
zl_+RH3Tg*^um}!8Wh4_7z$7e#ub?Jag37>3td1M8B<7hHP=V#6HWC`^)k`8xP7=Dc
zDD<Y#0AImIxCv|GH>e#xLIqZXRWwn3)Iv$99d<wkI25CBG-^XHqmE`S7RN=Xc~_w}
zcBDG_*MKi+kl&*w{@v<NP&+KiHe?Jch4H9VC!rQdMP)1<m6?868i%0*o`PH(XF8U}
z6{vuB)^NRv_tT&O$59KNLyp_IirUFzGa}BbS48a~9@W1&DzFZyiF;UkKQj|6&^{iO
z$$3~8|K-|)gQ%UHMNRx2DrE)Mejk;YLVF%g9(9HlQMWxA6=-+ti32ehx8Ww-g%z<+
zEpKDvQJHZUSz#F}^3~=B)Q+~9`^{tKDf0p<<=3qKi}?VRQC*-O5RE#rOze--k-OtM
zXDF!SZ>Ww=ymy<^un5&j7=qKRJ`;6UUc+LTi^|k$EQ*^^JKu#GzZaGA1E>rgL-jk2
zA$tGMKPx!SCDedxX1=xmV)fhR15Be|A!?#-b-V!5k^AaoAlY_YT!io1^F|!FHrfVt
zXVS48>pMdz=*(Y2o$+kc4wqpu+=!vL!`zSB$r03<eu2@Lj|%8dRDY+QciY2I^HoF5
z*9euN=g?JZTT{@$4yX)tLrs`w_2H-iSr~?6QT?ac^I7&h2Q}YZeD=PZt5D-MVG!;?
z1-P#s`R_~NkUfa1?+uJbWh53Ac_M1Z&s%#MCQ;8oW#COz=C-32{t&g`Nz_Kppcc$W
zzQWG$sQDuskbkA5asxiYSQ8s!JJiGzuq`e?eLzlPEZ)F67?R*!+J>mi&BAcZvHD_E
zrgBm1tU`Ul*P~wB_grf@iRyS6Bk;P_Z=oW8h~@Ap7RPc#sR`py<LaZnY)PnzyP_`J
zAghl@9gT~LI2ZMSbKj$&FVi_Jfj6-oK0-~@ir&gZ57dHL7>N^6cj8sl&T~*HpNBfK
zH?6(_)qe*nGY3)goj?M2ohuYHFdr51EmX&#MqVZ&Q43T=O;i<2VgpnvTcZN)W$hzS
z8+i#8;B3^q^H3XDjV*Bl#_RpROhG9w(%73g5|yed7=>}D0Gp!jKwH!i4MwFt3+v(p
ztFJ-@_ztSy9@GX7na9mMtflw=6a@{qjfzlLTLFZk7AS$rNLkeLSZl9?3M>(ItCLYj
zIRMpvGIG(KS*Ww#YJQ5!%nfuk;ZGDa;5MrM2o+Fp6EE^;jH6z`>a9^JZjZW@>DUId
zPyuhkPPh~G&A)?syTY1!f!0I?+OaA5SBD`q=yjTkU2&at_z{)br}!M!ZRXX7Blpu;
zj4kjGDv*0v4a1vz--mkGntBGR-x{Qga~2g)XbbXRn?f8<TVX2d!8}aC4Oj~cP~Y}Q
zqR;|~_%Zgx(pWm#+gUACraGbek3mk=S%@UnIc(2wAwMacXqT&)Mxi;fNoOur#1Bym
zoyS<bZ|!A?vK;k9)Y*1MHsegO`Zm-hy?{F7yQs_e5Oo<Jq3%pE(xN-&mZG4uFOT}L
z)WA}hi27EyM+Mjk$D-fbpJEy6K^%NpERVVq38;lyqn>v~1(IQAqVCuztf2RQJcVc)
z=Aj0zF*l<I?n7Ow1J-^7xlhjL7>kclM^KgTbSgGREj$agkzCYwV<RdPdr=!bfT4Q-
zKcS!rzI@ieZ$8w5KcO;n3-ui+#PS%?&TEfD1>DeViJG`GD#d+JJIz2H=_u5OTx)+F
z!(AE{QP_zqP#rox&!1xKf_f_!qAqCw$KfUHhF#iwKi6|{8TF5`D)wWr&UPv)kQu0>
znPYW7DkJOARfioELh(KGC~D^?Q3KDSQuzZaGxy9w)Hq*9Z^3ZX2BPo{AIE^||8G79
z%ETtr5$r;>@9RYV)o{=nj-oo|p#nQ??cbVL%zRY8o2Y*GQK^4o&m&U2OIaFqv~^Gm
zwlX`Q`gcnq|0=v_4I@wkCLy=ec^x%yEo#AyR^Nf~)c0WmUPAtiIH8@r-+sxcd55CL
zkHu%NDb}aH4b}gGOQ9BpqFuZN8=wZJU=8eT^=YV`&bInutVVsc)eoAVn&-@G=5MG^
zdZE?ByLxrEJcSq@#G@`nN3$2kQy+#!aXu>IrPh87>rgL1Wgx2Cv)`LeTQeKg|1H$`
zJo8IbAm{Me`+waY{Dn$=FfXwzhZ<NHm61kR9otxam^sdzj_N-T!*GeUuQcB^_o6;n
zM=?zA|9J`;c*Q#8n|H1KDOTor(eB>BI8^^+RAA4WJ<LI<jAo$%dEMHVm}|@}lJ%Ya
z6g1&S=4YsZUs?SkDrMKKejByGe=!Q9U-0_ZMAaLj0&9mM_yTHtZ;Zg<SP3Vft5m;1
zL9RtM>+C_j$A!27pP&|8-^24TD&X(1I9|2-P4k|$7os*&j6Wc<lo?~zN+bVzkZ29b
zW=GWDgdV8ZCKL5KuEJKh7j=fep>`bH)BAH>2K5CTgxbJ#RDiFd0$zwEG1uxFdXj$y
zu+<v&p#~mAwI4B0qB3*_HPH=g|J8h8?N3qTi>7<y!%_Xqm@&wyIW??4!KI*yr=cQW
zfc0?;?!t4Z9pv=#Tx!0Jk+g3`W##}X;IFVGUPO)i85O`od;Zwki}m&{wOfXQ&bBeC
zV-K@0D#e3Q6HP`f@K4kZ7ohqtHvOo6Yf$61p!yv#KSBkThZ=Xm({(OehwG>b3e5Yc
z1$})yBTy5TwR%P5tLwy}Cd{_>NvL^dnDenT^|!3P1#42@kCpZQU$hPnQ4xmq^(L%{
znkd%l38<YlMfFQX1vm(`z({O}FQfWx#%6dJbwqc~h<@Ieu_mVJ{qILXJ9rnh;11Np
zA6Wax*8Vwap>NEeQGxu08ejZH?@mOc=BbXFry-Wb=d7NF>OTNo6^2pJ#G_FIr=udC
zXTF2#_W|l}!ZECk1*nNj^!LWq#OBl+TYU^_o@uD@OHu1AM;+zX{^VZ|cG93o1E?Jx
zK?QQ!ykr)j-j4gIaj^ruaq+0Pr!i_=x|xCM_jlC1lg%8gKs|Q=`By~SX^=;(!`G+?
zuVDqeftu(s@*Be`GSJIJH&pv%jKWu}{st<LH_dgZw`{xBKQ+&}_TU<7qQC4x@E|Xs
zC{%kKDxi91L)4CwP?_t6T5vF`{}^+kJ^zQ*Uo+>M?otXm!{w+9>_AO;6!in-Gt}$y
zE2>}AU@wr`sFc=2^>2v^pp)4P706JG!BJMvL5*90%;!3*DDXSd*=-%}pkAXtPyxjc
z@fL20+HpFT!HKBnbL{y_Os2jIW3T|@FgU~e*Ka(kJp~(KCMM|pUq(R@9Y;<0HCDpw
z*bJYb1~eV&{n8nQ>gUHQxEY(^2~>vuz;;+-nD>Jv&76dKz6^75E0%OAwEUa*FPT)-
zWgCl%bPg)@>rp$&L;V8!8TC9O)B6I(V*>T@sP?z9D!y-igB7ViK+RurxHnH7boIWb
zQqaI0d$105*^Z&k@DtS8o-)5RZ=lZpj@2Kb<_R6)wb#TB)Ei<?oQy&E5h~*+Mv#9^
zeBK&<KrMI&)&2(tW5`I)FjRXaYKN7u6eeRhc1MkW5j8Hu>Y1oO$6za*f(mr^Nb;|<
zJViqr{2t3;%qTCyB-EeT4yc9GQ43_CCLD<xKf&rb_I#1mm!WpL7M1#)sCn|tv#u4c
znm5fqQ416u?JW?6+EE;;Jsvf2W897H?fGqNNBut5!=_o@PKP1)(wT{!@DkQWx7rxq
zMGBo!Dg6pd;P0p(i;vB)Y;WPRsEkxY1(1ND*v9OPI*OjCoenayuqgGZ=1gQ<v@_cp
z7NG_#%l2=t@*uFKYGjcAcx-cjk?KtX?W!*c3S5p$4Dm<T%`87|lG8OiYYhLJFf!Ze
zI&u6c{`b<<z}mWbKL42dANcDu=n|OTppGxFH(|9e&@1t4U!Y#&<-X#Xu_LobOwFD+
zA#=*~z!yorpwfN&_K8iIkd@8(_07!695*q`f3s<?K!;`>!u%`SUJT4=H!#G1qtm`(
zO=6Q8wQSrhur8%?P~h_}ErR?}sV)3{Q<DQLQ{N5>bnX!-;t%dU$^TmK8i75%Z}|M{
z`~Js2vtQ4^`F`O(|J{KV0>S-<`T}DIobd%-7?c+r&C2<Qm;dNr>fAWAB7fofg3WXM
bt%i0FEE#&Sn19yjZGoh$W+DC=<I?{JihF{g

diff --git a/application/translations/zh/LC_MESSAGES/messages.po b/application/translations/zh/LC_MESSAGES/messages.po
index 4eac4c61..ba18fdb8 100644
--- a/application/translations/zh/LC_MESSAGES/messages.po
+++ b/application/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KindleEar v3.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-06-03 20:15-0300\n"
+"POT-Creation-Date: 2024-06-09 21:53-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -221,8 +221,8 @@ msgid "Host"
 msgstr "主机"
 
 #: application/templates/adv_archive.html:119
+#: application/templates/adv_dict.html:79
 #: application/templates/adv_inboundmail.html:34
-#: application/templates/adv_reader.html:50
 #: application/templates/book_audiolator.html:113
 #: application/templates/book_translator.html:80
 #: application/templates/settings.html:256
@@ -244,29 +244,28 @@ msgid "Inbound Mail"
 msgstr "入站邮件"
 
 #: application/templates/adv_base.html:66
-#: application/templates/adv_base.html:70
+#: application/templates/adv_base.html:70 application/templates/adv_dict.html:3
+#: application/templates/adv_dict.html:13 application/templates/reader.html:127
+msgid "Dictionary"
+msgstr "词典"
+
+#: application/templates/adv_base.html:75
+#: application/templates/adv_base.html:79
 #: application/templates/adv_import.html:8
 msgid "Import Feeds"
 msgstr "导入订阅列表"
 
-#: application/templates/adv_base.html:75
-#: application/templates/adv_base.html:79
+#: application/templates/adv_base.html:84
+#: application/templates/adv_base.html:88
 msgid "Cover Image"
 msgstr "封面图像"
 
-#: application/templates/adv_base.html:84
-#: application/templates/adv_base.html:88
+#: application/templates/adv_base.html:93
+#: application/templates/adv_base.html:97
 #: application/templates/adv_uploadcss.html:3
 msgid "Stylesheet"
 msgstr "样式表"
 
-#: application/templates/adv_base.html:93
-#: application/templates/adv_base.html:97
-#: application/templates/adv_reader.html:3 application/templates/base.html:182
-#: application/templates/reader.html:6
-msgid "Reader"
-msgstr "在线阅读"
-
 #: application/templates/adv_base.html:102
 #: application/templates/adv_base.html:106
 #: application/templates/adv_calibre_options.html:12
@@ -310,6 +309,38 @@ msgstr "取消全部"
 msgid "Deliver"
 msgstr "推送"
 
+#: application/templates/adv_dict.html:15
+msgid "Set up dictionaries for online reading."
+msgstr "设置在线阅读时使用的词典。"
+
+#: application/templates/adv_dict.html:18
+#: application/templates/adv_dict.html:40
+#: application/templates/adv_dict.html:62
+msgid "Book language"
+msgstr "书本语言"
+
+#: application/templates/adv_dict.html:27
+#: application/templates/adv_dict.html:49
+#: application/templates/adv_dict.html:66
+#: application/templates/book_translator.html:26
+msgid "Engine"
+msgstr "翻译引擎"
+
+#: application/templates/adv_dict.html:33
+#: application/templates/adv_dict.html:55
+#: application/templates/adv_dict.html:72
+msgid "Database"
+msgstr "数据库"
+
+#: application/templates/adv_dict.html:63
+msgid "Other languages"
+msgstr "其他语言"
+
+#: application/templates/adv_dict.html:84 application/view/reader.py:29
+#: application/view/reader.py:95
+msgid "Online reading feature has not been activated yet."
+msgstr "在线阅读功能尚未被激活。"
+
 #: application/templates/adv_import.html:3
 #: application/templates/adv_import.html:19
 msgid "Import"
@@ -394,75 +425,6 @@ msgstr "例子"
 msgid "Please input mail address"
 msgstr "请输入邮件地址"
 
-#: application/templates/adv_reader.html:18
-#: application/templates/reader.html:100
-msgid "Dictionary"
-msgstr "词典"
-
-#: application/templates/adv_reader.html:20
-msgid "Set up a dictionary for online reading."
-msgstr "设置在线阅读时使用的词典。"
-
-#: application/templates/adv_reader.html:23
-#: application/templates/book_translator.html:26
-msgid "Engine"
-msgstr "翻译引擎"
-
-#: application/templates/adv_reader.html:29
-#: application/templates/book_audiolator.html:41
-#: application/templates/book_translator.html:32
-msgid "Api Host"
-msgstr "主机"
-
-#: application/templates/adv_reader.html:33
-#: application/templates/book_audiolator.html:53
-#: application/templates/book_translator.html:36
-msgid "Api Key"
-msgstr "Api Key"
-
-#: application/templates/adv_reader.html:34
-#: application/templates/book_translator.html:37
-msgid "One key per line"
-msgstr "一行一码"
-
-#: application/templates/adv_reader.html:37
-#: application/templates/book_translator.html:40
-msgid "Source language"
-msgstr "源语言"
-
-#: application/templates/adv_reader.html:43
-#: application/templates/book_translator.html:46
-msgid "Target language"
-msgstr "目标语言"
-
-#: application/templates/adv_reader.html:56
-#: application/templates/book_audiolator.html:119
-#: application/templates/book_translator.html:86
-msgid "Test (Please save settings firstly)"
-msgstr "测试 (请先保存设置)"
-
-#: application/templates/adv_reader.html:58
-#: application/templates/book_audiolator.html:121
-#: application/templates/book_translator.html:88
-msgid "Text"
-msgstr "原文"
-
-#: application/templates/adv_reader.html:62
-#: application/templates/book_translator.html:92
-msgid "Translation"
-msgstr "译文"
-
-#: application/templates/adv_reader.html:67
-#: application/templates/book_audiolator.html:132
-#: application/templates/book_translator.html:97
-msgid "Test"
-msgstr "测试"
-
-#: application/templates/adv_reader.html:72 application/view/reader.py:30
-#: application/view/reader.py:93
-msgid "Online reading feature has not been activated yet."
-msgstr "在线阅读功能尚未被激活。"
-
 #: application/templates/adv_uploadcover.html:3
 msgid "Cover image"
 msgstr "封面图像"
@@ -517,7 +479,7 @@ msgstr "5秒钟后自动返回上一页"
 msgid "Click to back"
 msgstr "点击直接返回"
 
-#: application/templates/base.html:24 application/templates/reader.html:153
+#: application/templates/base.html:24 application/templates/reader.html:181
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
@@ -553,7 +515,7 @@ msgstr "全文RSS"
 msgid "Share"
 msgstr "分享"
 
-#: application/templates/base.html:34 application/templates/reader.html:154
+#: application/templates/base.html:34 application/templates/reader.html:182
 msgid "Are you sure to delete?"
 msgstr "您确认要删除吗？"
 
@@ -601,7 +563,7 @@ msgstr "语言代码不合法"
 msgid "Thank you for sharing."
 msgstr "谢谢您的分享。"
 
-#: application/templates/base.html:46 application/templates/reader.html:125
+#: application/templates/base.html:46 application/templates/reader.html:152
 msgid "Close"
 msgstr "关闭"
 
@@ -886,7 +848,7 @@ msgstr "这里什么都没有。"
 msgid "Please select a single item."
 msgstr "请选择单独一项。"
 
-#: application/templates/base.html:115 application/templates/reader.html:155
+#: application/templates/base.html:115 application/templates/reader.html:183
 msgid "Please select at least one item."
 msgstr "请选择至少一项。"
 
@@ -896,9 +858,8 @@ msgstr "请选择至少一项。"
 #: application/view/inbound_email.py:425 application/view/inbound_email.py:433
 #: application/view/inbound_email.py:448 application/view/inbound_email.py:469
 #: application/view/login.py:229 application/view/login.py:258
-#: application/view/reader.py:115 application/view/reader.py:132
-#: application/view/reader.py:174 application/view/settings.py:48
-#: application/view/share.py:37
+#: application/view/reader.py:118 application/view/reader.py:135
+#: application/view/settings.py:48 application/view/share.py:37
 msgid "Some parameters are missing or wrong."
 msgstr "一些参数为空或错误。"
 
@@ -983,6 +944,10 @@ msgstr "高级设置"
 msgid "Shared"
 msgstr "网友分享"
 
+#: application/templates/base.html:182 application/templates/reader.html:6
+msgid "Reader"
+msgstr "在线阅读"
+
 #: application/templates/book_audiolator.html:22
 #: application/templates/book_translator.html:19
 msgid "State"
@@ -1012,6 +977,11 @@ msgstr "留空则使用kindle_email"
 msgid "TTS Engine"
 msgstr "TTS引擎"
 
+#: application/templates/book_audiolator.html:41
+#: application/templates/book_translator.html:32
+msgid "Api Host"
+msgstr "主机"
+
 #: application/templates/book_audiolator.html:42
 msgid "Empty to use default endpoint"
 msgstr "留空为使用默认端点"
@@ -1020,6 +990,11 @@ msgstr "留空为使用默认端点"
 msgid "Region"
 msgstr "区域"
 
+#: application/templates/book_audiolator.html:53
+#: application/templates/book_translator.html:36
+msgid "Api Key"
+msgstr "Api Key"
+
 #: application/templates/book_audiolator.html:66
 msgid "Voice name"
 msgstr "语音名字"
@@ -1102,14 +1077,41 @@ msgid ""
 "instance hours."
 msgstr "注意：启用此特性会显著增加CPU实例小时数的消耗。"
 
+#: application/templates/book_audiolator.html:119
+#: application/templates/book_translator.html:86
+msgid "Test (Please save settings firstly)"
+msgstr "测试 (请先保存设置)"
+
+#: application/templates/book_audiolator.html:121
+#: application/templates/book_translator.html:88
+msgid "Text"
+msgstr "原文"
+
 #: application/templates/book_audiolator.html:127
 msgid "Your browser does not support the audio element."
 msgstr "您的浏览器不支持audio标签。"
 
+#: application/templates/book_audiolator.html:132
+#: application/templates/book_translator.html:97
+msgid "Test"
+msgstr "测试"
+
 #: application/templates/book_translator.html:21
 msgid "Enable"
 msgstr "启用"
 
+#: application/templates/book_translator.html:37
+msgid "One key per line"
+msgstr "一行一码"
+
+#: application/templates/book_translator.html:40
+msgid "Source language"
+msgstr "源语言"
+
+#: application/templates/book_translator.html:46
+msgid "Target language"
+msgstr "目标语言"
+
 #: application/templates/book_translator.html:52
 msgid "Translation Position"
 msgstr "译文位置"
@@ -1142,6 +1144,10 @@ msgstr "原文样式"
 msgid "Translated text style"
 msgstr "译文样式"
 
+#: application/templates/book_translator.html:92
+msgid "Translation"
+msgstr "译文"
+
 #: application/templates/change_password.html:15
 msgid "Old password"
 msgstr "原密码"
@@ -1243,6 +1249,10 @@ msgstr "已订阅"
 msgid "Library"
 msgstr "新闻源"
 
+#: application/templates/my.html:51
+msgid "get more recipes"
+msgstr "获取更多recipe"
+
 #: application/templates/my.html:68
 msgid "Subscription to selected recipe successful."
 msgstr "已成功订阅您选择的 Recipe"
@@ -1275,70 +1285,74 @@ msgstr "Edge扩展程序"
 msgid "Browser extensions also available"
 msgstr "浏览器扩展也有提供"
 
-#: application/templates/reader.html:37
+#: application/templates/reader.html:57
 msgid "Push current book"
 msgstr "推送当前书籍"
 
-#: application/templates/reader.html:43
+#: application/templates/reader.html:63
 msgid "Push current article"
 msgstr "推送当前文章"
 
-#: application/templates/reader.html:49
+#: application/templates/reader.html:71
 msgid "Delete selected books"
 msgstr "删除选择的书本"
 
-#: application/templates/reader.html:55
+#: application/templates/reader.html:77
 msgid "Allow click links"
 msgstr "允许点击链接"
 
-#: application/templates/reader.html:61
+#: application/templates/reader.html:82
+msgid "Top-left dict mode"
+msgstr "左上角激活词典"
+
+#: application/templates/reader.html:88
 msgid "eInk mode"
 msgstr "墨水屏模式"
 
-#: application/templates/reader.html:67
+#: application/templates/reader.html:94
 msgid "Increase font size"
 msgstr "增大字号"
 
-#: application/templates/reader.html:73
+#: application/templates/reader.html:100
 msgid "Decrease font size"
 msgstr "缩小字号"
 
-#: application/templates/reader.html:79
+#: application/templates/reader.html:106
 msgid "Visualize Touch Regions"
 msgstr "显示触摸区域图示"
 
-#: application/templates/reader.html:85
+#: application/templates/reader.html:112
 msgid "Help"
 msgstr "帮助"
 
-#: application/templates/reader.html:91
-#: application/templates/reader_404.html:125
+#: application/templates/reader.html:118
+#: application/templates/reader_404.html:135
 msgid "Menu"
 msgstr "菜单"
 
-#: application/templates/reader.html:105
+#: application/templates/reader.html:132
 msgid "Collapse all"
 msgstr "折叠所有"
 
-#: application/templates/reader.html:110
+#: application/templates/reader.html:137
 msgid "Expand all"
 msgstr "展开所有"
 
-#: application/templates/reader.html:115
-#: application/templates/reader_404.html:130
+#: application/templates/reader.html:142
+#: application/templates/reader_404.html:140
 msgid "Prev"
 msgstr "前一页"
 
-#: application/templates/reader.html:120
-#: application/templates/reader_404.html:133
+#: application/templates/reader.html:147
+#: application/templates/reader_404.html:143
 msgid "Next page"
 msgstr "下一页"
 
-#: application/templates/reader.html:156
+#: application/templates/reader.html:184
 msgid "Pushed successfully."
 msgstr "推送成功。"
 
-#: application/templates/reader.html:157
+#: application/templates/reader.html:185
 msgid "There are currently no books or articles being read."
 msgstr "当前没有正在阅读的书籍或文章。"
 
@@ -1563,9 +1577,9 @@ msgstr "转发"
 msgid "Fwd as Attach"
 msgstr "作为附件转发"
 
-#: application/view/admin.py:48 application/view/adv.py:410
-#: application/view/adv.py:454 application/view/settings.py:76
-#: application/view/translator.py:83 application/view/translator.py:167
+#: application/view/admin.py:48 application/view/adv.py:425
+#: application/view/settings.py:76 application/view/translator.py:83
+#: application/view/translator.py:167
 msgid "Settings Saved!"
 msgstr "设置已保存!"
 
@@ -1619,103 +1633,93 @@ msgstr "账号设置已更新。"
 msgid "The old password is wrong."
 msgstr "原密码错误。"
 
-#: application/view/adv.py:94 application/view/adv.py:95
-#: application/view/adv.py:96 application/view/adv.py:97
-#: application/view/adv.py:98 application/view/adv.py:99
-#: application/view/adv.py:100 application/view/adv.py:101
-#: application/view/adv.py:102 application/view/adv.py:103
+#: application/view/adv.py:93 application/view/adv.py:94
+#: application/view/adv.py:95 application/view/adv.py:96
+#: application/view/adv.py:97 application/view/adv.py:98
+#: application/view/adv.py:99 application/view/adv.py:100
+#: application/view/adv.py:101 application/view/adv.py:102
 msgid "Append hyperlink '{}' to article"
 msgstr "在每篇文章后附加 '{}' 超链接"
 
-#: application/view/adv.py:94 application/view/adv.py:95
-#: application/view/adv.py:96 application/view/adv.py:97
-#: application/view/adv.py:98
+#: application/view/adv.py:93 application/view/adv.py:94
+#: application/view/adv.py:95 application/view/adv.py:96
+#: application/view/adv.py:97
 msgid "Save to {}"
 msgstr "保存到 {}"
 
-#: application/view/adv.py:94
+#: application/view/adv.py:93
 msgid "evernote"
 msgstr "evernote"
 
-#: application/view/adv.py:95
+#: application/view/adv.py:94
 msgid "wiz"
 msgstr "为知笔记"
 
-#: application/view/adv.py:96
+#: application/view/adv.py:95
 msgid "pocket"
 msgstr "pocket"
 
-#: application/view/adv.py:97
+#: application/view/adv.py:96
 msgid "instapaper"
 msgstr "instapaper"
 
-#: application/view/adv.py:98
+#: application/view/adv.py:97
 msgid "wallabag"
 msgstr "wallabag"
 
-#: application/view/adv.py:99 application/view/adv.py:100
-#: application/view/adv.py:101 application/view/adv.py:102
+#: application/view/adv.py:98 application/view/adv.py:99
+#: application/view/adv.py:100 application/view/adv.py:101
 msgid "Share on {}"
 msgstr "分享到 {}"
 
-#: application/view/adv.py:99
+#: application/view/adv.py:98
 msgid "weibo"
 msgstr "微博"
 
-#: application/view/adv.py:100
+#: application/view/adv.py:99
 msgid "facebook"
 msgstr "facebook"
 
-#: application/view/adv.py:102
+#: application/view/adv.py:101
 msgid "tumblr"
 msgstr "tumblr"
 
-#: application/view/adv.py:103
+#: application/view/adv.py:102
 msgid "Open in browser"
 msgstr "在浏览器打开"
 
-#: application/view/adv.py:104
+#: application/view/adv.py:103
 msgid "Append qrcode of url to article"
 msgstr "在每篇文章后附加文章链接的二维码"
 
-#: application/view/adv.py:368 application/view/share.py:54
+#: application/view/adv.py:367 application/view/share.py:54
 #: application/view/subscribe.py:247
 msgid "Unknown command: {}"
 msgstr "未知命令：{}"
 
-#: application/view/adv.py:399 application/view/translator.py:77
-#: application/view/translator.py:160
-msgid "The api key is required."
-msgstr "需要填写api key."
-
-#: application/view/adv.py:420 application/view/translator.py:116
-#: application/view/translator.py:200
-msgid "The text is empty."
-msgstr "文本为空。"
-
-#: application/view/adv.py:456
+#: application/view/adv.py:427
 msgid "The format is invalid."
 msgstr "格式非法。"
 
-#: application/view/adv.py:488
+#: application/view/adv.py:459
 msgid "Authorization Error!<br/>{}"
 msgstr "申请授权过程失败！<br/>{}"
 
-#: application/view/adv.py:509
+#: application/view/adv.py:480
 msgid "Success authorized by Pocket!"
 msgstr "已经成功获得Pocket的授权！"
 
-#: application/view/adv.py:515
+#: application/view/adv.py:486
 msgid ""
 "Failed to request authorization of Pocket!<hr/>See details "
 "below:<br/><br/>{}"
 msgstr "申请Pocket授权失败!<hr/>错误信息参考如下：<br/><br/>{}"
 
-#: application/view/adv.py:536
+#: application/view/adv.py:507
 msgid "The Instapaper service encountered an error. Please try again later."
 msgstr "Instapaper服务器异常，请稍候再试。"
 
-#: application/view/adv.py:549
+#: application/view/adv.py:520
 msgid "Request type [{}] unsupported"
 msgstr "不支持你请求的命令类型 [{}]"
 
@@ -1816,15 +1820,20 @@ msgstr "这个是自动发送的邮件，请勿直接回复。"
 msgid "You can click the following link to reset your KindleEar password."
 msgstr "你可以点击下面的链接来重置你的KindleEar密码。"
 
-#: application/view/reader.py:95
+#: application/view/reader.py:97
 msgid "The article is missing?"
 msgstr "文章丢失了？"
 
-#: application/view/reader.py:192
+#: application/view/reader.py:180 application/view/translator.py:116
+#: application/view/translator.py:200
+msgid "The text is empty."
+msgstr "文本为空。"
+
+#: application/view/reader.py:274
 msgid "Failed to push: {}"
 msgstr "推送失败: {}"
 
-#: application/view/reader.py:240
+#: application/view/reader.py:322
 msgid "Failed to create ebook."
 msgstr "创建电子书失败。"
 
@@ -1837,13 +1846,13 @@ msgid "Title is requied!"
 msgstr "书籍标题不能为空！"
 
 #: application/view/settings.py:174
-msgid "Chinese"
-msgstr "中文"
-
-#: application/view/settings.py:175
 msgid "English"
 msgstr "英语"
 
+#: application/view/settings.py:175
+msgid "Chinese"
+msgstr "中文"
+
 #: application/view/settings.py:176
 msgid "French"
 msgstr "法语"
@@ -1940,6 +1949,70 @@ msgstr "他加禄语"
 msgid "Hausa"
 msgstr "豪萨语"
 
+#: application/view/settings.py:200
+msgid "Thai"
+msgstr "泰语"
+
+#: application/view/settings.py:201
+msgid "Polish"
+msgstr "波兰语"
+
+#: application/view/settings.py:202
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: application/view/settings.py:203
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: application/view/settings.py:204
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: application/view/settings.py:205
+msgid "Hebrew"
+msgstr "希伯来语"
+
+#: application/view/settings.py:206
+msgid "Norwegian"
+msgstr "挪威语"
+
+#: application/view/settings.py:207
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: application/view/settings.py:208
+msgid "Danish"
+msgstr "丹麦语"
+
+#: application/view/settings.py:209
+msgid "Ukrainian"
+msgstr "乌克兰语"
+
+#: application/view/settings.py:210
+msgid "Tamil"
+msgstr "泰米尔语"
+
+#: application/view/settings.py:211
+msgid "Marathi"
+msgstr "马拉地语"
+
+#: application/view/settings.py:212
+msgid "Burmese"
+msgstr "缅甸语"
+
+#: application/view/settings.py:213
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: application/view/settings.py:214
+msgid "Azerbaijani"
+msgstr "阿塞拜疆语"
+
+#: application/view/settings.py:215
+msgid "Kazakh"
+msgstr "哈萨克语"
+
 #: application/view/share.py:60
 msgid "There is no {} email yet."
 msgstr "还没有设置 {} email."
@@ -2032,3 +2105,7 @@ msgstr "此Recipe的网站登录信息已经被删除。"
 msgid "The login information for this recipe has been saved."
 msgstr "此Recipe的网站登录信息已经保存。"
 
+#: application/view/translator.py:77 application/view/translator.py:160
+msgid "The api key is required."
+msgstr "需要填写api key."
+
diff --git a/application/view/adv.py b/application/view/adv.py
index 568cecad..b259bc18 100644
--- a/application/view/adv.py
+++ b/application/view/adv.py
@@ -372,30 +372,23 @@ def AdvDeleteCssAjaxPost(user: KeUser):
 @login_required()
 def AdvDict(user: KeUser):
     from dictionary import all_dict_engines
-    dictParams = user.cfg('reader_params').get('dicts', {}).copy()
-    #js的字典是不按顺序的，需要转换为字典列表再传递给html
-    #列表长度为3，最后一个元素为默认字典，[{language:,engine:,database:,},]
-    defDict = dictParams.pop('und', {})
-    defDict['language'] = 'und'
-    dictsCfg = [{}, {}, defDict]
-    for idx, (language, cfg) in enumerate(list(dictParams.items())[:2]):
-        cfg['language'] = language
-        dictsCfg[idx] = cfg
-
-    engines = json.dumps({name: {'databases': klass.databases} for name,klass in all_dict_engines.items()})
+    #[{language:,engine:,database:,},]
+    dictParams = user.cfg('reader_params').get('dicts', [])
+    
+    engines = {name: {'databases': klass.databases} for name,klass in all_dict_engines.items()}
     return adv_render_template('adv_dict.html', 'dictionary', user=user, engines=engines, 
-        dictsCfg=dictsCfg, tips='', langMap=LangMap())
+        dictParams=dictParams, tips='', langMap=LangMap())
     
 @bpAdv.post("/adv/dict", endpoint='AdvDictPost')
 @login_required()
 def AdvDictPost(user: KeUser):
-    from dictionary import all_dict_engines
     form = request.form
-    newParams = {}
+    newParams = []
     for idx in range(3):
         language = form.get(f'language{idx}', '').split('-')[0] if idx < 2 else 'und'
-        item = {'engine': form.get(f'engine{idx}', ''), 'database': form.get(f'database{idx}', '')}
-        newParams[language] = item
+        engine = form.get(f'engine{idx}', '')
+        database = form.get(f'database{idx}', '')
+        newParams.append({'language': language, 'engine': engine, 'database': database})
     
     params = user.cfg('reader_params')
     params.update({'dicts': newParams})
diff --git a/application/view/reader.py b/application/view/reader.py
index 362f7b26..4817f89b 100644
--- a/application/view/reader.py
+++ b/application/view/reader.py
@@ -11,7 +11,7 @@
 from flask_babel import gettext as _
 from build_ebook import html_to_book
 from ..base_handler import *
-from ..utils import xml_escape, xml_unescape, str_to_int, str_to_float
+from ..utils import xml_escape, xml_unescape, str_to_int, str_to_float, str_to_bool
 from ..back_end.db_models import *
 from ..back_end.send_mail_adpt import send_to_kindle
 from .settings import get_locale
@@ -95,7 +95,8 @@ def ReaderArticleNoFoundRoute(user):
         tips = _("Online reading feature has not been activated yet.")
     elif tips is None:
         tips = _('The article is missing?')
-    return render_template('reader_404.html', tips=tips.strip())
+    params = user.cfg('reader_params')
+    return render_template('reader_404.html', tips=tips.strip(), params=params)
 
 #获取文章或图像内容
 @bpReader.route("/reader/article/<path:path>", endpoint='ReaderArticleRoute')
@@ -155,11 +156,13 @@ def ReaderDeletePost(user: KeUser, userDir: str):
 @login_required(forAjax=True)
 @reader_route_preprocess(forAjax=True)
 def ReaderSettingsPost(user: KeUser, userDir: str):
-    fontSize = str_to_float(request.form.get('fontSize', '1.0'), 1.0)
-    allowLinks = request.form.get('allowLinks', '')
-    inkMode = str_to_int(request.form.get('inkMode', '1'), 1)
+    form = request.form
+    fontSize = str_to_float(form.get('fontSize', '1.0'), 1.0)
+    allowLinks = 1 if str_to_bool(form.get('allowLinks', 'true')) else 0
+    topleftDict = 1 if str_to_bool(form.get('topleftDict', 'true')) else 0
+    inkMode = str_to_int(form.get('inkMode', '1'), 1)
     params = user.cfg('reader_params')
-    params.update({'fontSize': fontSize, 'allowLinks': allowLinks, 'inkMode': inkMode})
+    params.update({'fontSize': fontSize, 'allowLinks': allowLinks, 'inkMode': inkMode, 'topleftDict': topleftDict})
     user.set_cfg('reader_params', params)
     user.save()
     return {'status': 'ok'}
@@ -169,17 +172,47 @@ def ReaderSettingsPost(user: KeUser, userDir: str):
 @login_required(forAjax=True)
 @reader_route_preprocess(forAjax=True)
 def ReaderDictRoute(user: KeUser, userDir: str):
-    from dictionary import CreateDictInst
+    from dictionary import CreateDictInst, GetDictDisplayName
     form = request.form if request.method == 'POST' else request.args
     word = form.get('word')
     language = form.get('language', '').replace('_', '-').split('-')[0].lower() #书本语种
     if not word:
         return {'status': _("The text is empty.")}
 
-    params = user.cfg('reader_params').get('dicts', {})
-    defDict = params.get('und', {})
-    dictParams = params.get(language, defDict)
-    inst = CreateDictInst(dictParams.get('engine', ''), dictParams.get('database', ''))
+    #为一个字典列表[{language:,engine:,database:,}]
+    dictParams = user.cfg('reader_params').get('dicts', [])
+
+    #优先使用网页传递过来的引擎和数据库参数
+    engine = form.get('engine')
+    database = form.get('database')
+    if not engine or not database:
+        defDict = {}
+        params = {}
+        for item in dictParams:
+            itemLang = item.get('language', 'und')
+            if not itemLang or (itemLang == 'und'):
+                defDict = item
+            elif not params and (itemLang == language):
+                params = item
+        if not params:
+            params = defDict
+        engine = params.get('engine', '')
+        database = params.get('database', '')
+    
+    inst = CreateDictInst(engine, database)
+    #将其他可选的词典信息也传递给网页
+    others = []
+    added = set()
+    for e in dictParams:
+        itemEngine = e.get('engine')
+        itemDb = e.get('database')
+        indi = f'{itemEngine}.{itemDb}'
+        if (indi not in added) and ((itemEngine != inst.name) or (itemDb != inst.database)):
+            added.add(indi)
+            dbName = GetDictDisplayName(itemEngine, itemDb)
+            others.append({'language': e.get('language', ''), 'engine': itemEngine, 'database': itemDb,
+                'dbName': f'{itemEngine} [{dbName}]'})
+
     try:
         definition = inst.definition(word, language)
         if not definition and language: #如果查询不到，尝试使用构词法词典获取词根
@@ -189,7 +222,8 @@ def ReaderDictRoute(user: KeUser, userDir: str):
                 definition = inst.definition(word, language) #再次查询
     except Exception as e:
         definition = f'Error: {e}'
-    return {'status': 'ok', 'word': word, 'definition': definition}
+    return {'status': 'ok', 'word': word, 'definition': definition, 
+        'dictname': str(inst), 'others': others}
 
 #根据构词法获取词干
 #language: 语种代码，只有前两个字母
@@ -217,7 +251,7 @@ def GetWordStem(word, language):
     if dic and os.path.exists(aff):
         #根据情况，哪个包能用就用哪个包： cyhunspell, hunspell
         if hasattr(hunspell, 'HunSpell'):
-            hObj = hunspell.HunSpell(dic, aff)
+            hObj = hunspell.HunSpell(dic, aff) #type:ignore
         else:
             dir_ = os.path.dirname(dic)
             dic = os.path.splitext(os.path.basename(dic))[0]
@@ -287,7 +321,7 @@ def PushSingleArticle(src: str, title: str, user: KeUser, userDir: str, language
     else:
         return _('Failed to create ebook.')
 
-#获取当前用户保存的所有电子书，返回一个列表[{date:, books: [{title:, articles:[{text:, src:}],},...]}, ]
+#获取当前用户保存的所有电子书，返回一个列表[{date:, books: [{title:, articles:[{title:, src:}],},...]}, ]
 def GetSavedOebList(userDir: str) -> list:
     if not os.path.exists(userDir):
         return []
@@ -334,7 +368,7 @@ def ExtractBookMeta(opfFile: str) -> dict:
     
     return ret
 
-#从toc.ncx里面提取文章列表，返回一个字典列表 [{text:,'src':,}]
+#从toc.ncx里面提取文章列表，返回一个字典列表 [{title:,'src':,}]
 def ExtractArticleList(ncxFile: str, prefix: str) -> list:
     if not os.path.exists(ncxFile):
         return []
@@ -356,5 +390,5 @@ def ExtractArticleList(ncxFile: str, prefix: str) -> list:
             text = (text.text or '').strip()
             src = src.attrib.get('src', '')
             if text and src:
-                ret.append({'text': text, 'src': f'{prefix}/{src}'})
+                ret.append({'title': text, 'src': f'{prefix}/{src}'})
     return ret
diff --git a/application/view/settings.py b/application/view/settings.py
index 812c98bc..4bbbb656 100644
--- a/application/view/settings.py
+++ b/application/view/settings.py
@@ -171,8 +171,8 @@ def get_locale():
 
 #各种语言的语种代码和文字描述的对应关系
 def LangMap():
-    return {"zh-cn": _("Chinese"),
-        "en-us": _("English"),
+    return {"en-us": _("English"),
+        "zh-cn": _("Chinese"),
         "fr-fr": _("French"),
         "es-es": _("Spanish"),
         "pt-br": _("Portuguese"),
@@ -196,4 +196,20 @@ def LangMap():
         "pa": _("Punjabi"),
         "jv": _("Javanese"),
         "tl": _("Tagalog"),
-        "ha": _("Hausa"),}
+        "ha": _("Hausa"),
+        "th-th": _("Thai"),
+        "pl-pl": _("Polish"),
+        "ro-ro": _("Romanian"),
+        "hu-hu": _("Hungarian"),
+        "sv-se": _("Swedish"),
+        "he-il": _("Hebrew"),
+        "no-no": _("Norwegian"),
+        "fi-fi": _("Finnish"),
+        "da-dk": _("Danish"),
+        "uk-ua": _("Ukrainian"),
+        "ta": _("Tamil"),
+        "mr": _("Marathi"),
+        "my": _("Burmese"),
+        "am": _("Amharic"),
+        "az": _("Azerbaijani"),
+        "kk": _("Kazakh"),}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ce576c96..8f614dc5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,7 +10,8 @@ COPY ./config.py ./tools/update_req.py ./docker/gunicorn.conf.py ./main.py ./
 COPY ./tools/mp3cat/*mp3cat /usr/local/bin/
 
 #RUN python update_req.py docker[all]
-RUN python update_req.py docker && \
+RUN apt install libhunspell-dev && \
+    python update_req.py docker $TARGETPLATFORM && \
     pip install --upgrade pip && \
     pip install --no-cache-dir -r requirements.txt && \
     chmod +x /usr/local/bin/*mp3cat
diff --git a/docs/Chinese/README.md b/docs/Chinese/README.md
index ea90ec90..cf533c15 100644
--- a/docs/Chinese/README.md
+++ b/docs/Chinese/README.md
@@ -8,6 +8,7 @@ sort: 2
 - [部署方法](https://cdhigh.github.io/KindleEar/Chinese/deployment.html)
     - [Google cloud (PaaS)](https://cdhigh.github.io/KindleEar/Chinese/deployment.html#gae)
     - [Docker (VPS)](https://cdhigh.github.io/KindleEar/Chinese/deployment.html#docker)
+    - [群晖 (NAS)](https://cdhigh.github.io/KindleEar/Chinese/deployment.html#synology)
     - [Oracle cloud (VPS)](https://cdhigh.github.io/KindleEar/Chinese/deployment.html#oracle-cloud)
     - [Pythonanywhere (PaaS)](https://cdhigh.github.io/KindleEar/Chinese/deployment.html#python-anywhere)
 - [在线阅读](https://cdhigh.github.io/KindleEar/Chinese/reader.html)
diff --git a/docs/Chinese/deployment.md b/docs/Chinese/deployment.md
index b5164857..736e5fbb 100644
--- a/docs/Chinese/deployment.md
+++ b/docs/Chinese/deployment.md
@@ -198,6 +198,20 @@ sudo usermod -aG docker your-username
 ```
 
 
+
+<a id="synology"></a>
+## 群晖 (NAS)
+1. 打开 "套件中心"，搜索并安装Docker。
+2. 打开Docker (Container Manager)，在注册表搜索 "KindleEar"，安装 kindleear/kindleear。
+3. 运行KindleEar，进入设置界面：
+  3.1 第一步勾选"启用自动重新启动"；
+  3.2 第二步：
+    3.2.1 在"端口设置"里面选择一个本地端口(比如:8001)映射到KindleEar的8000端口
+    3.2.2 在"存储空间设置"里面添加一个文件夹映射到 `/data`，比如 `/docker/data` 映射到 `/data`，权限为"读取/写入"
+4. 启动完成后使用 http://ip:8001 访问。  
+5. 如果需要链接分享功能，可以设置环境变量 `APP_DOMAIN`。 
+
+
 <a id="oracle-cloud"></a>
 ## Oracle cloud (VPS)
 这是手动在一个 [Oracle VPS](https://cloud.oracle.com/) 上部署的步骤，比较复杂，一般不建议，如果没有特殊要求，推荐使用docker镜像。   
diff --git a/docs/Chinese/reader.md b/docs/Chinese/reader.md
index 683e851d..24b19b65 100644
--- a/docs/Chinese/reader.md
+++ b/docs/Chinese/reader.md
@@ -5,7 +5,8 @@ sort: 4
 
 
 ## 概述
-KindleEar支持邮件推送和在线阅读，邮件推送的好处是可以离线阅读，下载到电子书设备后可以随身携带随时阅读；在线阅读的好处是不占用电子书设备空间，不需要手动删除电子书，而且可以支持更多的电子书设备。   
+KindleEar支持邮件推送和在线阅读，内置一个为电子墨水屏进行专门优化的在线阅读器。    
+邮件推送的好处是可以离线阅读，下载到电子书设备后可以随身携带随时阅读；在线阅读的好处是不占用电子书设备空间，不需要手动删除电子书，而且可以支持更多的电子书设备。   
 
 ## 启用和配置
 1. 配置 `EBOOK_SAVE_DIR` 为一个有可写权限的目录，可以在config.py里面修改或通过环境变量传递。 
@@ -15,11 +16,11 @@ KindleEar支持邮件推送和在线阅读，邮件推送的好处是可以离
 3. 建议在网页的 "设置" 页面 设置合适的 "网络书架" 时间， KindleEar会自动清理超过这个时间的电子书，省心省力。   
 
 4. 在线阅读页面专门为电子墨水屏优化，使用翻页代替滚动，页面被分成5个点击区域：    
-  * 左上角为前一篇文章   
-  * 右上角为下一篇文章   
-  * 页面上部中间区域为打开菜单   
-  * 左侧中间部分为上一页   
-  * 页面的其余区域全部为下一页，不管使用左手或右手持书，都很便捷的切换下一页   
+  * 左上角默认为激活查词模式，可以通过选项菜单调整为 "打开前一篇文章"   
+  * 右上角为 "下一篇文章"   
+  * 页面上部中间区域为 "打开菜单"   
+  * 左侧中间部分为 "上一页"   
+  * 页面的其余区域全部为 "下一页"，不管使用左手或右手持书，都很便捷的切换下一页   
   * 到当前文章的最后一页继续点击下一页区域自动打开下一篇文章   
   * 在文章第一页点击上一页区域自动打开上一篇文章    
 
@@ -42,8 +43,20 @@ KindleEar支持邮件推送和在线阅读，邮件推送的好处是可以离
 查词原理是通过自动提取最靠近点击区域的一个单词，单词前后需要有空格符，所以中日韩只可以查询单个字，不能查询词组。  
 提取出单词后，发送给你部署的KindleEar网站翻译，接收到答复后再显示出来。   
 
-1. 为了使用词典功能，首先在 "高级设置"/"在线阅读" 选项页里面配置需要使用的翻译引擎和语种。   
-2. 在阅读时遇到不认识的单词，打开菜单，选择 "词典" 后自动进入查词模式（没有任何提示），点击需要查询的单词即可，查词后会自动退出查词模式，如果还要查，则再次到菜单里点击 "词典"。   
-3. 点击弹出的查词框内任意地方关闭查词框。    
-4. 默认支持美式英语的单词变形查询(构词法规则)，如果需要支持其他语种的构词法，请下载对应的hunspell格式的文件（.dic/.aff），然后拷贝到 `data/dict/morphology` ，注意不要存放到子目录下，KindleEar会自动使用和书本语言相匹配的构词法规则。   
+
+### 安装词典
+1. KindleEar支持在线词典 [dict.org](https://dict.org/), [dict.cc](https://www.dict.cc/), [dict.cn](http://dict.cn/), [韦氏词典](https://www.merriam-webster.com/)， 这几个词典不需要安装，开箱即用。    
+2. KindleEar同时还支持离线词典，当前支持 stardict 格式词典，下载对应的词典后，解压到 `data/dict` 目录，可以使用子目录整理不同的词典，然后重启 KindleEar 服务以便能刷新词典列表。   
+3. 已经默认支持美式英语的构词法规则，可以查询单词时态语态复数等变形，如果需要支持其他语种的构词法，请下载对应的hunspell格式的文件（.dic/.aff），然后拷贝到 `data/dict/morphology` ，注意不要存放到子目录下，KindleEar会自动使用和书本语言相匹配的构词法规则。   
 至于到哪里下载hunspell/myspell构词法文件，可以到github/sourceforge等网站上搜索。额外的，这里有一个 [链接](https://sourceforge.net/projects/goldendict/files/better%20morphologies/1.0/)
+
+
+### 使用词典
+1. 为了使用词典功能，首先在 "高级设置"/"词典" 选项页里面配置需要使用的翻译引擎和语种。   
+
+2. 在阅读时遇到不认识的单词：
+2.1. 如果已经激活左上角词典模式（默认），则点击页面左上角进入查词模式；
+2.2. 打开菜单，点击 "词典" 图标；
+任意一种方式进入查词模式后，页面左上角会出现一个词典角标，点击需要查询的单词即可，查词后会自动退出查词模式。   
+
+3. 点击弹出的查词框内任意地方关闭查词框。    
diff --git a/docs/English/README.md b/docs/English/README.md
index c142a474..dc6a4ebb 100644
--- a/docs/English/README.md
+++ b/docs/English/README.md
@@ -9,6 +9,7 @@ sort: 1
     - [Google cloud (PaaS)](https://cdhigh.github.io/KindleEar/English/deployment.html#gae)
     - [Docker (VPS)](https://cdhigh.github.io/KindleEar/English/deployment.html#docker)
     - [Oracle cloud (VPS)](https://cdhigh.github.io/KindleEar/English/deployment.html#oracle-cloud)
+    - [Synology (NAS)](https://cdhigh.github.io/KindleEar/Chinese/deployment.html#synology)
     - [Pythonanywhere (PaaS)](https://cdhigh.github.io/KindleEar/English/deployment.html#python-anywhere)
 - [Online reader](https://cdhigh.github.io/KindleEar/English/reader.html)
 - [Browser extension](https://cdhigh.github.io/KindleEar/English/extension.html)
diff --git a/docs/English/deployment.md b/docs/English/deployment.md
index 2988f59b..ab95d552 100644
--- a/docs/English/deployment.md
+++ b/docs/English/deployment.md
@@ -205,6 +205,18 @@ sudo usermod -aG docker your-username
 
 
 
+<a id="synology"></a>
+## Synology (NAS)
+1. Open the "Package Center", search for and install Docker.
+2. Open Docker (Container Manager), search for "KindleEar" in tab "Registry", and install "kindleear/kindleear".
+3. Run KindleEar and show the settings ui:
+   3.1. First, check "Enable auto-restart";
+   3.2. Second:
+      3.2.1. In the "Port Settings", select a local port (eg. 8001) to map to KindleEar's 8000 port;
+      3.2.2. In the "Volume Settings", add a folder mapped to `/data`, for example, map `/docker/data` to `/data`, with "Read/Write" permissions.
+4. After starting, access it via http://ip:8001.
+5. If you need the link sharing feature, you can set the environment variable `APP_DOMAIN`.   
+
 
 <a id="oracle-cloud"></a>
 ## Oracle cloud (VPS)   
diff --git a/docs/English/reader.md b/docs/English/reader.md
index 6e12e6e1..dbe16982 100644
--- a/docs/English/reader.md
+++ b/docs/English/reader.md
@@ -6,7 +6,7 @@ sort: 4
 
 ## Overview
 
-KindleEar supports email delivery and online reading.    
+KindleEar supports email delivery and online reading. Built-in an online reader specially optimized for e-ink screens.    
 The advantage of email delivery is the ability to read offline. After downloading to an e-book device, you can carry it with you and read it anytime.    
 The advantage of online reading is that it does not occupy space on the e-book device and does not require manual deletion of e-books, moreover, it can support more e-book devices.    
 
@@ -19,7 +19,7 @@ The advantage of online reading is that it does not occupy space on the e-book d
 3. It is recommended to set an appropriate "Web shelf" time on the "Settings" page. KindleEar will automatically clean up e-books that exceed this time, making it worry-free and effortless.    
 
 4. The online reading page is optimized for e-ink screens, using pagination instead of scrolling. The page is divided into 5 clickable areas:
-   * Top left corner: Previous article
+   * The top-left corner defaults to activating the dictionary lookup mode, which can be adjusted to 'Open Previous Article' through the options menu.    
    * Top right corner: Next article
    * Middle top area: Open menu
    * Middle left side: Previous page
@@ -48,14 +48,21 @@ The principle of the dictionary function is to automatically extract the word cl
 
 The extracted word is sent to your deployed KindleEar site for translation, and the response is displayed.   
 
-1. To use the dictionary function, first configure the translation engine and languages in "Advanced"/"Reader" options page.   
+### Installing Dictionaries
+1. KindleEar supports online dictionaries such as [dict.org](https://dict.org/), [dict.cc](https://www.dict.cc/), [dict.cn](http://dict.cn/), and [Merriam-Webster](https://www.merriam-webster.com/). These dictionaries require no installation and are ready to use out of the box.    
+2. KindleEar also supports offline dictionaries in the stardict format. After downloading the corresponding dictionary, unzip it into the `data/dict` directory. You can organize different dictionaries into subdirectories. Then, restart the KindleEar service to refresh the dictionary list.    
+3. By default, American English morphology queries are supported.    
+If you need to support morphology rules for other languages, please download the corresponding Hunspell format files (.dic/.aff), and then copy them to `data/dict/morphology`. Be careful not to store them in a subdirectory.    
+KindleEar will automatically use the morphology rules that match the book's language.   
+As for where to download Hunspell/MySpell morphology files, you can search on websites such as GitHub or SourceForge. Additionally, here is a [link](https://sourceforge.net/projects/goldendict/files/better%20morphologies/1.0/) you can check.   
 
-2. When encountering an unfamiliar word while reading, open the menu, select "Dictionary" to enter dictionary mode (no indication/tips is shown). Click the word to be queried, and dictionary mode will automatically exit after the query. To query again, click "Dictionary" in the menu again.    
 
-3. Click anywhere inside the pop-up dictionary box to close it.   
+### Using Dictionaries
+1. To use the dictionary function, first configure the translation engine and languages in "Advanced"/"Dictionary" options page.   
 
-4. By default, American English morphology queries are supported.    
-If you need to support morphology rules for other languages, please download the corresponding Hunspell format files (.dic/.aff), and then copy them to `data/dict/morphology`. Be careful not to store them in a subdirectory.    
-KindleEar will automatically use the morphology rules that match the book's language.   
+2. When encountering an unfamiliar word while reading.  
+2.1. If the top-left corner dictionary mode is activated (by default), clicking on the top-left corner of the page will enter the dictionary lookup mode.     
+2.2. Open the menu and click on the 'Dictionary' icon.     
+After entering the dictionary lookup mode, a dictionary indicator will appear in the top-left corner of the page. Click on the word you want to look up, and the lookup mode will automatically exit after the lookup.   
 
-As for where to download Hunspell/MySpell morphology files, you can search on websites such as GitHub or SourceForge. Additionally, here is a [link](https://sourceforge.net/projects/goldendict/files/better%20morphologies/1.0/) you can check.   
+3. Click anywhere inside the pop-up dictionary box to close it.   
diff --git a/tools/run_flask.bat b/tools/run_flask.bat
index c876406f..c2e649e7 100644
--- a/tools/run_flask.bat
+++ b/tools/run_flask.bat
@@ -9,6 +9,7 @@ set TASK_QUEUE_SERVICE=apscheduler
 set TASK_QUEUE_BROKER_URL=memory
 set KE_TEMP_DIR=d:/temp
 set EBOOK_SAVE_DIR=d:/webshelf
+set DICTIONARY_DIR=d:/webshelf
 set LOG_LEVEL=info
 set HIDE_MAIL_TO_LOCAL=no
 python -m flask run --host=0.0.0.0 --debug
diff --git a/tools/update_req.py b/tools/update_req.py
index 88481d54..85f69de0 100644
--- a/tools/update_req.py
+++ b/tools/update_req.py
@@ -56,7 +56,9 @@ def new_secret_key(length=12):
 
 REQ_PLAT = {'gae': [('appengine-python-standard', '~=1.1.6'),
         ('google-cloud-texttospeech', '~=2.16.3')],
-    'docker': [('weedata', '>=0.2.7,<1.0.0'),('pymysql', '~=1.1.0'), #docker install all libs
+    'docker': [('cyhunspell', '~=2.0.2'), ('marisa_trie', '~=1.2.0')], #docker/amd64 basic libs
+    'dockerArm': [('hunspell', '~=0.5.5')], #docker/arm64 basic libs
+    'dockerAll': [('weedata', '>=0.2.7,<1.0.0'),('pymysql', '~=1.1.0'), #docker[all] install all libs
         ('psycopg2-binary', '~=2.9.9'),('pymongo', '~=4.6.3'),('redis', '~=5.0.3'),
         ('celery', '~=5.3.6'),('flask-rq2', '~=18.3'),('sqlalchemy', '~=2.0.29')],
 }
@@ -105,7 +107,8 @@ def dockerize_config_py(cfgFile, arg):
         'TASK_QUEUE_SERVICE': 'apscheduler', 'TASK_QUEUE_BROKER_URL': 'memory',
         'KE_TEMP_DIR': '/tmp', 'DOWNLOAD_THREAD_NUM': '3', 'ALLOW_SIGNUP': 'no',
         'HIDE_MAIL_TO_LOCAL': 'yes', 'LOG_LEVEL': 'warning', 'SECRET_KEY': new_secret_key,
-        'DELIVERY_KEY': lambda: new_secret_key(6), 'EBOOK_SAVE_DIR': '/data/ebooks'}
+        'DELIVERY_KEY': lambda: new_secret_key(6), 'EBOOK_SAVE_DIR': '/data/ebooks', 
+        'DICTIONARY_DIR': '/data/dict'}
     ret = []
     inDocComment = False
     pattern = r"^([_A-Z]+)\s*=\s*(.+)$"
@@ -169,7 +172,7 @@ def gaeify_config_py(cfgFile):
         'DATABASE_URL': 'datastore', 'TASK_QUEUE_SERVICE': 'gae', 'TASK_QUEUE_BROKER_URL': '',
         'KE_TEMP_DIR': '/tmp', 'DOWNLOAD_THREAD_NUM': '2', 'ALLOW_SIGNUP': 'no',
         'HIDE_MAIL_TO_LOCAL': 'yes', 'LOG_LEVEL': 'warning', 'SECRET_KEY': new_secret_key,
-        'DELIVERY_KEY': lambda: new_secret_key(6), 'EBOOK_SAVE_DIR': ''}
+        'DELIVERY_KEY': lambda: new_secret_key(6), 'EBOOK_SAVE_DIR': '', 'DICTIONARY_DIR': ''}
     ret = []
     inDocComment = False
     pattern = r"^([_A-Z]+)\s*=\s*(.+)$"
@@ -278,7 +281,9 @@ def UpdateOrAddParam(key1, value, key2=None): #Update if exists or add if not
 
     dockerArgs = ''
     gaeify = False
-    if len(sys.argv) == 2 and sys.argv[1] == '--help':
+    arg1 = sys.argv[1] if len(sys.argv) >= 2 else ''
+    arg2 = sys.argv[2] if len(sys.argv) >= 3 else '' #TARGETPLATFORM
+    if arg1 == '--help':
         print('This script can help you to update config.py and requirements.txt.')
         print('Command arguments:')
         print('  docker              : prepare for docker image')
@@ -288,14 +293,14 @@ def UpdateOrAddParam(key1, value, key2=None): #Update if exists or add if not
         print('  gae[B2,1,t2,20m]    : prepare for deploying in gae, customize worker params')
         print('  empty               : do not modify config.py, only update requirements.txt')
         sys.exit(1)
-    elif len(sys.argv) == 2 and sys.argv[1].startswith('docker'):
+    elif arg1.startswith('docker'):
         print('\nUpdating config.py and requirements.txt for Docker deployment.\n')
-        dockerize_config_py(cfgFile, sys.argv[1])
-        dockerArgs = sys.argv[1]
-    elif len(sys.argv) == 2 and sys.argv[1].startswith('gae'):
+        dockerize_config_py(cfgFile, arg1)
+        dockerArgs = arg1
+    elif arg1.startswith('gae'):
         print('\nUpdating config.py and requirements.txt for GAE deployment.\n')
         gaeify_config_py(cfgFile)
-        update_worker_yaml(workerYamlFile, sys.argv[1])
+        update_worker_yaml(workerYamlFile, arg1)
         gaeify = True
     else:
         print('\nThis script can help you to update requirements.txt.\n')
@@ -309,7 +314,9 @@ def UpdateOrAddParam(key1, value, key2=None): #Update if exists or add if not
     broker = cfg['TASK_QUEUE_BROKER_URL']
     plat = ''
     if dockerArgs == 'docker[all]':
-        plat = 'docker'
+        plat = 'dockerAll'
+    elif dockerArgs.startswith('docker'):
+        plat = 'dockerArm' if 'arm' in arg2 else 'docker'
     elif (cfg['DATABASE_URL'].startswith('datastore') or cfg['TASK_QUEUE_SERVICE'] == 'gae'):
         plat = 'gae'
     
