diff -Nru goldendict-1.5.0~git20131003/aard.cc goldendict-1.5.0~git20150923/aard.cc
--- goldendict-1.5.0~git20131003/aard.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/aard.cc	2015-09-23 08:26:24.000000000 +0000
@@ -9,6 +9,9 @@
 #include "langcoder.hh"
 #include "fsencoding.hh"
 #include "decompress.hh"
+#include "gddebug.hh"
+#include "ftshelpers.hh"
+#include "htmlescape.hh"
 
 #include <map>
 #include <set>
@@ -44,7 +47,7 @@
 
 namespace {
 
-DEF_EX_STR( exNotDctFile, "Not an Sdictionary file", Dictionary::Ex )
+DEF_EX_STR( exNotAardFile, "Not an AARD file", Dictionary::Ex )
 DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
 DEF_EX_STR( exWordIsTooLarge, "Enountered a word that is too large:", Dictionary::Ex )
 DEF_EX_STR( exSuddenEndOfFile, "Sudden end of file", Dictionary::Ex )
@@ -261,6 +264,21 @@
 
     virtual QString const& getDescription();
 
+    virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                              int searchMode, bool matchCase,
+                                                              int distanceBetweenWords,
+                                                              int maxResults );
+    virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+    virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+    virtual void setFTSParameters( Config::FullTextSearch const & fts )
+    {
+      can_FTS = fts.enabled
+                && !fts.disabledTypes.contains( "AARD", Qt::CaseInsensitive )
+                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    }
+
 protected:
 
     virtual void loadIcon() throw();
@@ -269,7 +287,8 @@
 
     /// Loads the article.
     void loadArticle( quint32 address,
-                      string & articleText );
+                      string & articleText,
+                      bool rawText = false );
     string convert( string const & in_data );
 
     friend class AardArticleRequest;
@@ -300,8 +319,15 @@
                           idxHeader.indexRootOffset ),
                idx, idxMutex );
 
-    // Read decription
+    // Full-text search parameters
+
+    can_FTS = true;
 
+    ftsIdxName = indexFile + "_FTS";
+
+    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+      FTS_index_completed.ref();
 }
 
 AardDictionary::~AardDictionary()
@@ -362,7 +388,9 @@
     }
 
     QString text = QString::fromUtf8( inConverted.c_str() );
-    text.replace( QRegExp( "<\\s*a\\s*href\\s*=\\s*[\\\"'](w:|s:){0,1}([^#](?!ttp://)[^\\\"']*)(.)" ),
+    text.replace( QRegExp( "<\\s*a\\s*href\\s*=\\s*\\\"(w:|s:){0,1}([^#](?!ttp://)[^\\\"]*)(.)" ),
+                  "<a href=\"bword:\\2\"");
+    text.replace( QRegExp( "<\\s*a\\s*href\\s*=\\s*'(w:|s:){0,1}([^#](?!ttp://)[^']*)(.)" ),
                   "<a href=\"bword:\\2\"");
 
     static QRegExp self_closing_divs( "(<div\\s[^>]*)/>", Qt::CaseInsensitive );  // <div ... />
@@ -375,7 +403,8 @@
 }
 
 void AardDictionary::loadArticle( quint32 address,
-                                   string & articleText )
+                                  string & articleText,
+                                  bool rawText )
 {
     quint32 articleOffset = address;
     quint32 articleSize;
@@ -406,7 +435,7 @@
       }
       catch( std::exception &ex )
       {
-        qWarning( "AARD: Failed loading article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+        gdWarning( "AARD: Failed loading article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
         break;
       }
       catch(...)
@@ -473,7 +502,12 @@
     }
 
     if( !articleText.empty() )
+    {
+      if( rawText )
+        return;
+
       articleText = convert( articleText );
+    }
     else
       articleText = string( QObject::tr( "Article decoding error" ).toUtf8().constData() );
 
@@ -542,6 +576,61 @@
     return dictionaryDescription;
 }
 
+void AardDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "Aard: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Aard: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void AardDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    headword.clear();
+    string articleText;
+
+    loadArticle( articleAddress, articleText );
+
+    text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Aard: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+sptr< Dictionary::DataRequest > AardDictionary::getSearchResults( QString const & searchString,
+                                                                  int searchMode, bool matchCase,
+                                                                  int distanceBetweenWords,
+                                                                  int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 /// AardDictionary::getArticle()
 
 class AardArticleRequest;
@@ -756,13 +845,13 @@
         try
         {
 
-          qDebug( "Aard: Building the index for dictionary: %s", i->c_str() );
+          gdDebug( "Aard: Building the index for dictionary: %s\n", i->c_str() );
 
           {
             QFileInfo info( FsEncoding::decode( i->c_str() ) );
-            if( info.size() > ULONG_MAX )
+            if( static_cast< quint64 >( info.size() ) > ULONG_MAX )
             {
-              qWarning( "File %s is too large", i->c_str() );
+              gdWarning( "File %s is too large\n", i->c_str() );
               continue;
             }
           }
@@ -778,7 +867,7 @@
               || strncmp( dictHeader.keyLengthFormat, ">H", 2 )
               || strncmp( dictHeader.articleLengthFormat, ">L", 2) )
           {
-              qWarning( "File %s is not in supported aard format", i->c_str() );
+              gdWarning( "File %s is not in supported aard format\n", i->c_str() );
               continue;
           }
 
@@ -787,7 +876,7 @@
 
           if( size == 0 )
           {
-              qWarning( "File %s has invalid metadata", i->c_str() );
+              gdWarning( "File %s has invalid metadata", i->c_str() );
               continue;
           }
 
@@ -801,7 +890,7 @@
 
           if( meta.empty() )
           {
-              qWarning( "File %s has invalid metadata", i->c_str() );
+              gdWarning( "File %s has invalid metadata", i->c_str() );
               continue;
           }
 
@@ -945,19 +1034,28 @@
         }
         catch( std::exception & e )
         {
-          qWarning( "Aard dictionary indexing failed: %s, error: %s\n",
+          gdWarning( "Aard dictionary indexing failed: %s, error: %s\n",
                     i->c_str(), e.what() );
           continue;
         }
         catch( ... )
         {
-          qWarning( "Aard dictionary indexing failed\n" );
+          gdWarning( "Aard dictionary indexing failed\n" );
           continue;
         }
       } // if need to rebuild
-      dictionaries.push_back( new AardDictionary( dictId,
-                                                   indexFile,
-                                                   dictFiles ) );
+      try
+      {
+        dictionaries.push_back( new AardDictionary( dictId,
+                                                    indexFile,
+                                                    dictFiles ) );
+      }
+      catch( std::exception & e )
+      {
+        gdWarning( "Aard dictionary initializing failed: %s, error: %s\n",
+                  i->c_str(), e.what() );
+        continue;
+      }
   }
   return dictionaries;
 }
diff -Nru goldendict-1.5.0~git20131003/about.cc goldendict-1.5.0~git20150923/about.cc
--- goldendict-1.5.0~git20131003/about.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/about.cc	2015-09-23 08:26:24.000000000 +0000
@@ -25,6 +25,8 @@
                                .arg( GD_CXX_MSVC_MAJOR )
                                .arg( GD_CXX_MSVC_MINOR )
                                .arg( GD_CXX_MSVC_BUILD );
+#elif defined (__clang__) && defined (__clang_version__)
+  QString compilerVersion = QLatin1String( "Clang " ) + QLatin1String( __clang_version__ );
 #else
   QString compilerVersion = QLatin1String( "GCC " ) + QLatin1String( __VERSION__ );
 #endif
diff -Nru goldendict-1.5.0~git20131003/article_maker.cc goldendict-1.5.0~git20150923/article_maker.cc
--- goldendict-1.5.0~git20131003/article_maker.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/article_maker.cc	2015-09-23 08:26:24.000000000 +0000
@@ -12,7 +12,7 @@
 #include <QTextDocumentFragment>
 #include "folding.hh"
 #include "langcoder.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 using std::vector;
 using std::string;
@@ -41,7 +41,8 @@
 }
 
 std::string ArticleMaker::makeHtmlHeader( QString const & word,
-                                          QString const & icon ) const
+                                          QString const & icon,
+                                          bool expandOptionalParts ) const
 {
   string result =
     "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
@@ -81,7 +82,7 @@
     result += css.data();
 
     // Turn on/off expanding of article optional parts
-    if( needExpandOptionalParts )
+    if( expandOptionalParts )
       result += "\n.dsl_opt\n{\n  display: inline;\n}\n\n.hidden_expand_opt\n{\n  display: none;\n}\n";
 
     result += "</style>\n";
@@ -201,12 +202,41 @@
 sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor(
   QString const & inWord, unsigned groupId,
   QMap< QString, QString > const & contexts,
-  QSet< QString > const & mutedDicts ) const
+  QSet< QString > const & mutedDicts,
+  QStringList const & dictIDs ) const
 {
+  if( !dictIDs.isEmpty() )
+  {
+    QStringList ids = dictIDs;
+    std::vector< sptr< Dictionary::Class > > ftsDicts;
+
+    // Find dictionaries by ID's
+    for( unsigned x = 0; x < dictionaries.size(); x++ )
+    {
+      for( QStringList::Iterator it = ids.begin(); it != ids.end(); ++it )
+      {
+        if( *it == QString::fromStdString( dictionaries[ x ]->getId() ) )
+        {
+          ftsDicts.push_back( dictionaries[ x ] );
+          ids.erase( it );
+          break;
+        }
+      }
+      if( ids.isEmpty() )
+        break;
+    }
+
+    string header = makeHtmlHeader( inWord.trimmed(), QString(), true );
+
+    return new ArticleRequest( inWord.trimmed(), "",
+                               contexts, ftsDicts, header,
+                               -1, true );
+  }
+
   if ( groupId == Instances::Group::HelpGroupId )
   {
     // This is a special group containing internal welcome/help pages
-    string result = makeHtmlHeader( inWord, QString() );
+    string result = makeHtmlHeader( inWord, QString(), needExpandOptionalParts );
 
     if ( inWord == tr( "Welcome!" ) )
     {
@@ -278,7 +308,8 @@
 
   string header = makeHtmlHeader( inWord.trimmed(),
                                   activeGroup && activeGroup->icon.size() ?
-                                    activeGroup->icon : QString() );
+                                    activeGroup->icon : QString(),
+                                  needExpandOptionalParts );
 
   if ( mutedDicts.size() )
   {
@@ -306,7 +337,7 @@
 sptr< Dictionary::DataRequest > ArticleMaker::makeNotFoundTextFor(
   QString const & word, QString const & group ) const
 {
-  string result = makeHtmlHeader( word, QString() ) + makeNotFoundBody( word, group ) +
+  string result = makeHtmlHeader( word, QString(), true ) + makeNotFoundBody( word, group ) +
     "</body></html>";
 
   sptr< Dictionary::DataRequestInstant > r = new Dictionary::DataRequestInstant( true );
@@ -319,7 +350,7 @@
 
 sptr< Dictionary::DataRequest > ArticleMaker::makeEmptyPage() const
 {
-  string result = makeHtmlHeader( tr( "(untitled)" ), QString() ) +
+  string result = makeHtmlHeader( tr( "(untitled)" ), QString(), true ) +
     "</body></html>";
 
   sptr< Dictionary::DataRequestInstant > r =
@@ -333,7 +364,7 @@
 
 sptr< Dictionary::DataRequest > ArticleMaker::makePicturePage( string const & url ) const
 {
-  string result = makeHtmlHeader( tr( "(picture)" ), QString() )
+  string result = makeHtmlHeader( tr( "(picture)" ), QString(), true )
                   + "<a href=\"javascript: if(history.length>2) history.go(-1)\">"
                   + "<img src=\"" + url + "\" /></a>"
                   + "</body></html>";
@@ -473,8 +504,8 @@
       }
       catch( std::exception & e )
       {
-        qWarning( "getArticle request error (%s) in \"%s\"\n",
-                  e.what(), activeDicts[ x ]->getName().c_str() );
+        gdWarning( "getArticle request error (%s) in \"%s\"\n",
+                   e.what(), activeDicts[ x ]->getName().c_str() );
       }
     }
 
@@ -505,7 +536,7 @@
   if ( bodyDone )
     return;
 
-  DPRINTF( "some body finished\n" );
+  GD_DPRINTF( "some body finished\n" );
 
   bool wasUpdated = false;
 
@@ -516,7 +547,7 @@
     {
       // Good
 
-      DPRINTF( "one finished.\n" );
+      GD_DPRINTF( "one finished.\n" );
 
       Dictionary::DataRequest & req = *bodyRequests.front();
 
@@ -645,21 +676,21 @@
         }
         catch( std::exception & e )
         {
-          qWarning( "getDataSlice error: %s\n", e.what() );
+          gdWarning( "getDataSlice error: %s\n", e.what() );
         }
 
         wasUpdated = true;
 
         foundAnyDefinitions = true;
       }
-      DPRINTF( "erasing..\n" );
+      GD_DPRINTF( "erasing..\n" );
       bodyRequests.pop_front();
-      DPRINTF( "erase done..\n" );
+      GD_DPRINTF( "erase done..\n" );
     }
     else
     {
-        DPRINTF( "one not finished.\n" );
-        break;
+      GD_DPRINTF( "one not finished.\n" );
+      break;
     }
   }
 
@@ -896,8 +927,8 @@
 
 //  DPRINTF( "Looking up %s\n", qPrintable( currentSplittedWordCompound ) );
 
-  stemmedWordFinder->prefixMatch( currentSplittedWordCompound, activeDicts, 40, // Would one be enough? Leave 40 to be safe.
-                                  Dictionary::SuitableForCompoundSearching );
+  stemmedWordFinder->expressionMatch( currentSplittedWordCompound, activeDicts, 40, // Would one be enough? Leave 40 to be safe.
+                                      Dictionary::SuitableForCompoundSearching );
 }
 
 QString ArticleRequest::makeSplittedWordCompound()
@@ -929,7 +960,6 @@
 
   if ( results.size() )
   {
-    // Check if the aliases are acceptable
     wstring source = Folding::applySimpleCaseOnly( gd::toWString( currentSplittedWordCompound ) );
 
     bool hadSomething = false;
@@ -937,7 +967,14 @@
     for( unsigned x = 0; x < results.size(); ++x )
     {
       if ( results[ x ].second )
-        continue; // We're not interested in suggestions
+      {
+        // Spelling suggestion match found. No need to continue.
+        hadSomething = true;
+        lastGoodCompoundResult = currentSplittedWordCompound;
+        break;
+      }
+
+      // Prefix match found. Check if the aliases are acceptable.
 
       wstring result( Folding::applySimpleCaseOnly( gd::toWString( results[ x ].first ) ) );
 
diff -Nru goldendict-1.5.0~git20131003/article_maker.hh goldendict-1.5.0~git20150923/article_maker.hh
--- goldendict-1.5.0~git20131003/article_maker.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/article_maker.hh	2015-09-23 08:26:24.000000000 +0000
@@ -53,7 +53,8 @@
   sptr< Dictionary::DataRequest > makeDefinitionFor( QString const & word, unsigned groupId,
                                                      QMap< QString, QString > const & contexts,
                                                      QSet< QString > const & mutedDicts =
-                                                       QSet< QString >() ) const;
+                                                       QSet< QString >(),
+                                                     QStringList const & dictIDs = QStringList() ) const;
 
   /// Makes up a text which states that no translation for the given word
   /// was found. Sometimes it's better to call this directly when it's already
@@ -79,7 +80,8 @@
 private:
 
   /// Makes everything up to and including the opening body tag.
-  std::string makeHtmlHeader( QString const & word, QString const & icon ) const;
+  std::string makeHtmlHeader( QString const & word, QString const & icon,
+                              bool expandOptionalParts ) const;
 
   /// Makes the html body for makeNotFoundTextFor()
   static std::string makeNotFoundBody( QString const & word, QString const & group );
diff -Nru goldendict-1.5.0~git20131003/article_netmgr.cc goldendict-1.5.0~git20150923/article_netmgr.cc
--- goldendict-1.5.0~git20131003/article_netmgr.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/article_netmgr.cc	2015-09-23 08:26:24.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "article_netmgr.hh"
 #include "wstring_qt.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 using std::string;
 
 namespace
@@ -90,7 +90,7 @@
     if ( !req.url().host().endsWith( refererUrl.host() ) &&
          getHostBase( req.url() ) != getHostBase( refererUrl ) && !req.url().scheme().startsWith("data") )
     {
-      qWarning( "Blocking element \"%s\"\n", req.url().toEncoded().data() );
+      gdWarning( "Blocking element \"%s\"\n", req.url().toEncoded().data() );
 
       return new BlockedNetworkReply( this );
     }
@@ -126,12 +126,18 @@
 sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
   QUrl const & url, QString & contentType )
 {
-  DPRINTF( "getResource: %ls\n", url.toString().toStdWString().c_str() );
-  DPRINTF( "scheme: %ls\n", url.scheme().toStdWString().c_str() );
-  DPRINTF( "host: %ls\n", url.host().toStdWString().c_str() );
+  GD_DPRINTF( "getResource: %ls\n", url.toString().toStdWString().c_str() );
+  GD_DPRINTF( "scheme: %ls\n", url.scheme().toStdWString().c_str() );
+  GD_DPRINTF( "host: %ls\n", url.host().toStdWString().c_str() );
 
   if ( url.scheme() == "gdlookup" )
   {
+    if( !url.host().isEmpty() && url.host() != "localhost" )
+    {
+      // Strange request - ignore it
+      return new Dictionary::DataRequestInstant( false );
+    }
+
     contentType = "text/html";
 
     if ( url.queryItemValue( "blank" ) == "1" )
@@ -140,6 +146,15 @@
     bool groupIsValid = false;
 
     QString word = url.queryItemValue( "word" );
+
+    QString dictIDs = url.queryItemValue( "dictionaries" );
+    if( !dictIDs.isEmpty() )
+    {
+      // Individual dictionaries set from full-text search
+      QStringList dictIDList = dictIDs.split( "," );
+      return articleMaker.makeDefinitionFor( word, 0, QMap< QString, QString >(), QSet< QString >(), dictIDList );
+    }
+
     unsigned group = url.queryItemValue( "group" ).toUInt( &groupIsValid );
 
     // See if we have some dictionaries muted
@@ -203,8 +218,8 @@
             }
             catch( std::exception & e )
             {
-              qWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
-                        dictionaries[ x ]->getName().c_str() );
+              gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
+                         dictionaries[ x ]->getName().c_str() );
               return sptr< Dictionary::DataRequest >();
             }
         }
@@ -277,7 +292,7 @@
     if ( req->isFinished() )
     {
       emit finishedSignal();
-      DPRINTF( "In-place finish.\n" );
+      GD_DPRINTF( "In-place finish.\n" );
     }
   }
 }
@@ -300,12 +315,12 @@
 
 qint64 ArticleResourceReply::bytesAvailable() const
 {
-  long avail = req->dataSize();
+  qint64 avail = req->dataSize();
   
   if ( avail < 0 )
     return 0;
   
-  return (size_t) avail - alreadyRead +  QNetworkReply::bytesAvailable();
+  return avail - alreadyRead + QNetworkReply::bytesAvailable();
 }
 
 qint64 ArticleResourceReply::readData( char * out, qint64 maxSize )
@@ -315,18 +330,18 @@
   if ( maxSize == 0 )
     return 0;
 
-  DPRINTF( "====reading %d bytes\n", (int)maxSize );
+  GD_DPRINTF( "====reading %d bytes\n", (int)maxSize );
 
   bool finished = req->isFinished();
   
-  long avail = req->dataSize();
+  qint64 avail = req->dataSize();
 
   if ( avail < 0 )
     return finished ? -1 : 0;
 
-  size_t left = (size_t) avail - alreadyRead;
+  qint64 left = avail - alreadyRead;
   
-  size_t toRead = maxSize < left ? maxSize : left;
+  qint64 toRead = maxSize < left ? maxSize : left;
 
   try
   {
diff -Nru goldendict-1.5.0~git20131003/article_netmgr.hh goldendict-1.5.0~git20150923/article_netmgr.hh
--- goldendict-1.5.0~git20131003/article_netmgr.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/article_netmgr.hh	2015-09-23 08:26:24.000000000 +0000
@@ -53,7 +53,7 @@
   Q_OBJECT
 
   sptr< Dictionary::DataRequest > req;
-  size_t alreadyRead;
+  qint64 alreadyRead;
 
 public:
 
diff -Nru goldendict-1.5.0~git20131003/article-style.css goldendict-1.5.0~git20150923/article-style.css
--- goldendict-1.5.0~git20131003/article-style.css	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/article-style.css	2015-09-23 08:26:24.000000000 +0000
@@ -398,15 +398,9 @@
   padding-left: 81px;
 }
 
-.dsl_ex,
-.dsl_ex font[color] /* DSL Feature: Enforce the example color even if the childen tags say otherwise */
-{
-  color: gray;
-}
-
 .dsl_p, .dsl_p :not(a) /* DSL Feature: Enforce the style even if the childen tags say otherwise, except links */
 {
-  color: green;
+  color: green !important; /* DSL label color must have highest priority */
   font-style: italic;
   cursor: default;
   font-weight: normal; /* DSL feature: labels are always of normal weight */
@@ -443,7 +437,19 @@
 .dsl_opt
 {
   display: none;
-  color: grey;
+}
+
+.dsl_opt,
+.dsl_opt .dsl_ex,
+.dsl_opt .dsl_ex :not(a),
+.dsl_opt .dsl_ex font[color] /* DSL Feature: Enforce the optional zone color even if the childen tags say otherwise */
+{
+  color: gray;
+}
+
+.dsl_ex, .dsl_ex .dsl_opt
+{
+  color: gray;
 }
 
 /* Style for expand optional parts button */
@@ -493,10 +499,14 @@
 
 /************* Zim dictionaries **************/
 
+.zimdict
+{
+  font-size: 110%!important;
+}
+
 .zimdict_headword
 {
   font-weight: bold!important;
-/*  font-size: 150%; */
 }
 
 /************* Spelling suggestions *****************/
@@ -556,6 +566,28 @@
   color: #0000FF;
 }
 
+.dictserver_from
+{
+  font-size: 110%;
+  font-weight: 600;
+}
+
+/************* Epwing dictionaries *****************/
+
+.epwing_narrow_font
+{
+  width: 7px;
+  height: 13px;
+  vertical-align: -15%;
+}
+
+.epwing_wide_font
+{
+  width: 13px;
+  height: 13px;
+  vertical-align: -15%;
+}
+
 /************* Websites *****************/
 
 .website_padding
@@ -2844,3 +2876,11 @@
     vertical-align: text-bottom;
     background-image:url('qrcx://localhost/icons/downarrow.png');
 }
+
+/********** Slob dictionaries ***********/
+
+.slobdict img.imgtex
+{
+    vertical-align: baseline !important;
+}
+
diff -Nru goldendict-1.5.0~git20131003/article-style-st-lingoes-blue.css goldendict-1.5.0~git20150923/article-style-st-lingoes-blue.css
--- goldendict-1.5.0~git20131003/article-style-st-lingoes-blue.css	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/article-style-st-lingoes-blue.css	2015-09-23 08:26:24.000000000 +0000
@@ -60,6 +60,7 @@
 {
   display:block;
   -webkit-box-ordinal-group: 1;
+  -webkit-box-flex: 1;
 }
 
 .gdactivearticle .gddictname {
@@ -179,8 +180,7 @@
 	font-family: Arial;
 }
 
-.dsl_ex,
-.dsl_ex font[color]
+.dsl_ex, .dsl_ex .dsl_opt
 {
 	color: slategray;
 }
@@ -194,16 +194,19 @@
 }
 
 /* Stress settings */
-.dsl_stress_without_accent {
+.dsl_stress_without_accent,
+.dsl_opt .dsl_ex .dsl_stress_without_accent {
 	display: none;
 	color: green;
 }
 
-.dsl_stress_with_accent {
+.dsl_stress_with_accent,
+.dsl_opt .dsl_ex .dsl_stress_with_accent {
 	display: inline;
 	color: #DD0000;
 }
-.dsl_stress {
+.dsl_stress,
+.dsl_opt .dsl_ex .dsl_stress {
 	display: inline;
 	color: blue;
 }
diff -Nru goldendict-1.5.0~git20131003/article-style-st-lingvo.css goldendict-1.5.0~git20150923/article-style-st-lingvo.css
--- goldendict-1.5.0~git20131003/article-style-st-lingvo.css	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/article-style-st-lingvo.css	2015-09-23 08:26:24.000000000 +0000
@@ -89,7 +89,12 @@
   margin-top: 10px;
 }
 
-.dsl_ex
+.dsl_ex, .dsl_ex .dsl_opt
 {
   color: inherit;
 }
+
+.dsl_com
+{
+  color: black;
+}
diff -Nru goldendict-1.5.0~git20131003/article-style-st-modern.css goldendict-1.5.0~git20150923/article-style-st-modern.css
--- goldendict-1.5.0~git20131003/article-style-st-modern.css	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/article-style-st-modern.css	2015-09-23 08:26:24.000000000 +0000
@@ -81,6 +81,7 @@
 {
   display:block;
   -webkit-box-ordinal-group: 1;
+  -webkit-box-flex: 1;
 }
 
 .gdactivearticle .gddictname
@@ -165,8 +166,7 @@
   margin-top: 1.5em;
 }
 
-.dsl_ex,
-.dsl_ex font[color]
+.dsl_ex, .dsl_ex .dsl_opt
 {
   color: steelblue;
 }
diff -Nru goldendict-1.5.0~git20131003/articleview.cc goldendict-1.5.0~git20150923/articleview.cc
--- goldendict-1.5.0~git20131003/articleview.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/articleview.cc	2015-09-23 08:26:24.000000000 +0000
@@ -16,10 +16,12 @@
 #include "wstring_qt.hh"
 #include "webmultimediadownload.hh"
 #include "programs.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "ffmpegaudio.hh"
 #include <QDebug>
 #include <QCryptographicHash>
+#include "gestures.hh"
+#include "fulltextsearch.hh"
 
 #if QT_VERSION >= 0x040600
 #include <QWebElement>
@@ -35,13 +37,67 @@
 
 #include <QBuffer>
 
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
 #include "speechclient.hh"
 #endif
 
 using std::map;
 using std::list;
 
+/// AccentMarkHandler class
+///
+/// Remove accent marks from text
+/// and mirror position in normalized text to original text
+
+class AccentMarkHandler
+{
+  QString normalizedString;
+  QVector< int > accentMarkPos;
+public:
+  static QChar accentMark()
+  { return QChar( 0x301 ); }
+
+  /// Create text without accent marks
+  /// and store mark positions
+  void setText( QString const & baseString )
+  {
+    accentMarkPos.clear();
+    normalizedString.clear();
+    int pos = 0;
+    QChar mark = accentMark();
+
+    for( int x = 0; x < baseString.length(); x++ )
+    {
+      if( baseString.at( x ) == mark )
+      {
+        accentMarkPos.append( pos );
+        continue;
+      }
+      normalizedString.append( baseString.at( x ) );
+      pos++;
+    }
+  }
+
+  /// Return text without accent marks
+  QString const & normalizedText() const
+  { return normalizedString; }
+
+  /// Convert position into position in original text
+  int mirrorPosition( int const & pos ) const
+  {
+    int newPos = pos;
+    for( int x = 0; x < accentMarkPos.size(); x++ )
+    {
+      if( accentMarkPos.at( x ) < pos )
+        newPos++;
+      else
+        break;
+    }
+    return newPos;
+  }
+};
+
+/// End of DslAccentMark class
 
 static QVariant evaluateJavaScriptVariableSafe( QWebFrame * frame, const QString & variable )
 {
@@ -54,6 +110,7 @@
                           std::vector< sptr< Dictionary::Class > > const & allDictionaries_,
                           Instances::Groups const & groups_, bool popupView_,
                           Config::Class const & cfg_,
+                          QAction & openSearchAction_,
                           QAction * dictionaryBarToggled_,
                           GroupComboBox const * groupComboBox_ ):
   QFrame( parent ),
@@ -67,13 +124,16 @@
   articleDownAction( this ),
   goBackAction( this ),
   goForwardAction( this ),
-  openSearchAction( this ),
   selectCurrentArticleAction( this ),
   copyAsTextAction( this ),
   inspectAction( this ),
+  openSearchAction( openSearchAction_ ),
   searchIsOpened( false ),
   dictionaryBarToggled( dictionaryBarToggled_ ),
-  groupComboBox( groupComboBox_ )
+  groupComboBox( groupComboBox_ ),
+  ftsSearchIsOpened( false ),
+  ftsSearchMatchCase( false ),
+  ftsPosition( 0 )
 {
   ui.setupUi( this );
 
@@ -139,7 +199,6 @@
   ui.definition->addAction( &articleDownAction );
   connect( &articleDownAction, SIGNAL( triggered() ), this, SLOT( moveOneArticleDown() ) );
 
-  openSearchAction.setShortcut( QKeySequence( "Ctrl+F" ) );
   ui.definition->addAction( &openSearchAction );
   connect( &openSearchAction, SIGNAL( triggered() ), this, SLOT( openSearch() ) );
 
@@ -162,6 +221,7 @@
 
   ui.definition->installEventFilter( this );
   ui.searchFrame->installEventFilter( this );
+  ui.ftsSearchFrame->installEventFilter( this );
 
   // Load the default blank page instantly, so there would be no flicker.
 
@@ -176,6 +236,14 @@
                           blankPage );
 
   expandOptionalParts = cfg.preferences.alwaysExpandOptionalParts;
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  ui.definition->grabGesture( Gestures::GDPinchGestureType );
+  ui.definition->grabGesture( Gestures::GDSwipeGestureType );
+#endif
+
+  // Variable name for store current selection range
+  rangeVarName = QString( "sr_%1" ).arg( QString::number( (quint64)this, 16 ) );
 }
 
 // explicitly report the minimum size, to avoid
@@ -198,6 +266,11 @@
   if ( cfg.preferences.useInternalPlayer )
     Ffmpeg::AudioPlayer::instance().stop();
 #endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  ui.definition->ungrabGesture( Gestures::GDPinchGestureType );
+  ui.definition->ungrabGesture( Gestures::GDSwipeGestureType );
+#endif
 }
 
 void ArticleView::showDefinition( QString const & word, unsigned group,
@@ -259,6 +332,49 @@
   ui.definition->setCursor( Qt::WaitCursor );
 }
 
+void ArticleView::showDefinition( QString const & word, QStringList const & dictIDs,
+                                  QRegExp const & searchRegExp, unsigned group )
+{
+  if( dictIDs.isEmpty() )
+    return;
+
+#ifndef DISABLE_INTERNAL_PLAYER
+  // first, let's stop the player
+  if ( cfg.preferences.useInternalPlayer )
+    Ffmpeg::AudioPlayer::instance().stop();
+#endif
+
+  QUrl req;
+
+  req.setScheme( "gdlookup" );
+  req.setHost( "localhost" );
+  req.addQueryItem( "word", word );
+  req.addQueryItem( "dictionaries", dictIDs.join( ",") );
+  req.addQueryItem( "regexp", searchRegExp.pattern() );
+  if( searchRegExp.caseSensitivity() == Qt::CaseSensitive )
+    req.addQueryItem( "matchcase", "1" );
+  if( searchRegExp.patternSyntax() == QRegExp::WildcardUnix )
+    req.addQueryItem( "wildcards", "1" );
+  req.addQueryItem( "group", QString::number( group ) );
+
+  // Update both histories (pages history and headwords history)
+  saveHistoryUserData();
+  emit sendWordToHistory( word );
+
+  // Any search opened is probably irrelevant now
+  closeSearch();
+
+  // Clear highlight all button selection
+  ui.highlightAllButton->setChecked(false);
+
+  emit setExpandMode( expandOptionalParts );
+
+  ui.definition->load( req );
+
+  //QApplication::setOverrideCursor( Qt::WaitCursor );
+  ui.definition->setCursor( Qt::WaitCursor );
+}
+
 void ArticleView::showAnticipation()
 {
   ui.definition->setHtml( "" );
@@ -362,6 +478,9 @@
   }
 
   emit pageLoaded( this );
+
+  if( ui.definition->url().hasQueryItem( "regexp" ) )
+    highlightFTSResults();
 }
 
 void ArticleView::handleTitleChanged( QString const & title )
@@ -440,6 +559,9 @@
   if ( !id.startsWith( "gdfrom-" ) )
     return; // Incorrect id
 
+  if ( !ui.definition->isVisible() )
+    return; // No action on background page, scrollIntoView there don't work
+
   if ( getArticlesList().contains( id.mid( 7 ) ) )
   {
     if ( moveToIt )
@@ -567,19 +689,45 @@
 
 bool ArticleView::handleF3( QObject * /*obj*/, QEvent * ev )
 {
-  if ( ev->type() == QEvent::ShortcutOverride ) {
+  if ( ev->type() == QEvent::ShortcutOverride
+       || ev->type() == QEvent::KeyPress )
+  {
     QKeyEvent * ke = static_cast<QKeyEvent *>( ev );
     if ( ke->key() == Qt::Key_F3 && isSearchOpened() ) {
       if ( !ke->modifiers() )
       {
-        on_searchNext_clicked();
+        if( ev->type() == QEvent::KeyPress )
+          on_searchNext_clicked();
+
+        ev->accept();
+        return true;
+      }
+
+      if ( ke->modifiers() == Qt::ShiftModifier )
+      {
+        if( ev->type() == QEvent::KeyPress )
+          on_searchPrevious_clicked();
+
+        ev->accept();
+        return true;
+      }
+    }
+    if ( ke->key() == Qt::Key_F3 && ftsSearchIsOpened )
+    {
+      if ( !ke->modifiers() )
+      {
+        if( ev->type() == QEvent::KeyPress )
+          on_ftsSearchNext_clicked();
+
         ev->accept();
         return true;
       }
 
       if ( ke->modifiers() == Qt::ShiftModifier )
       {
-        on_searchPrevious_clicked();
+        if( ev->type() == QEvent::KeyPress )
+          on_ftsSearchPrevious_clicked();
+
         ev->accept();
         return true;
       }
@@ -591,6 +739,59 @@
 
 bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
 {
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  if( ev->type() == QEvent::Gesture )
+  {
+    Gestures::GestureResult result;
+    QPoint pt;
+
+    bool handled = Gestures::handleGestureEvent( obj, ev, result, pt );
+
+    if( handled )
+    {
+      if( result == Gestures::ZOOM_IN )
+        zoomIn();
+      else
+      if( result == Gestures::ZOOM_OUT )
+        zoomOut();
+      else
+      if( result == Gestures::SWIPE_LEFT )
+        back();
+      else
+      if( result == Gestures::SWIPE_RIGHT )
+        forward();
+      else
+      if( result == Gestures::SWIPE_UP || result == Gestures::SWIPE_DOWN )
+      {
+        int delta = result == Gestures::SWIPE_UP ? -120 : 120;
+        QWidget *widget = static_cast< QWidget * >( obj );
+
+        QWidget *child = widget->childAt( widget->mapFromGlobal( pt ) );
+        if( child )
+        {
+          QWheelEvent whev( child->mapFromGlobal( pt ), pt, delta, Qt::NoButton, Qt::NoModifier );
+          qApp->sendEvent( child, &whev );
+        }
+        else
+        {
+          QWheelEvent whev( widget->mapFromGlobal( pt ), pt, delta, Qt::NoButton, Qt::NoModifier );
+          qApp->sendEvent( widget, &whev );
+        }
+      }
+    }
+
+    return handled;
+  }
+
+  if( ev->type() == QEvent::MouseMove )
+  {
+    if( Gestures::isFewTouchPointsPresented() )
+    {
+      ev->accept();
+      return true;
+    }
+  }
+#endif
 
   if ( handleF3( obj, ev ) )
   {
@@ -622,7 +823,9 @@
       if ( keyEvent->key() == Qt::Key_Space ||
            keyEvent->key() == Qt::Key_Backspace ||
            keyEvent->key() == Qt::Key_Tab ||
-           keyEvent->key() == Qt::Key_Backtab )
+           keyEvent->key() == Qt::Key_Backtab ||
+           keyEvent->key() == Qt::Key_Return ||
+           keyEvent->key() == Qt::Key_Enter )
         return false; // Those key have other uses than to start typing
 
       QString text = keyEvent->text();
@@ -784,8 +987,16 @@
   else
   if ( url.scheme().compare( "bword" ) == 0 )
   {
-    showDefinition( url.path(),
-                    getGroup( ref ), scrollTo, contexts );
+    if( ref.hasQueryItem( "dictionaries" ) )
+    {
+      QStringList dictsList = ref.queryItemValue( "dictionaries" )
+                                 .split( ",", QString::SkipEmptyParts );
+
+      showDefinition( url.path(), dictsList, QRegExp(), getGroup( ref ) );
+    }
+    else
+      showDefinition( url.path(),
+                      getGroup( ref ), scrollTo, contexts );
   }
   else
   if ( url.scheme() == "gdlookup" ) // Plain html links inherit gdlookup scheme
@@ -797,6 +1008,16 @@
     }
     else
     {
+      if( ref.hasQueryItem( "dictionaries" ) )
+      {
+        // Specific dictionary group from full-text search
+        QStringList dictsList = ref.queryItemValue( "dictionaries" )
+                                   .split( ",", QString::SkipEmptyParts );
+
+        showDefinition( url.path().mid( 1 ), dictsList, QRegExp(), getGroup( ref ) );
+        return;
+      }
+
       QString newScrollTo( scrollTo );
       if( url.hasQueryItem( "dict" ) )
       {
@@ -863,30 +1084,39 @@
       if ( activeDicts )
         for( unsigned x = 0; x < activeDicts->size(); ++x )
         {
-          sptr< Dictionary::DataRequest > req =
-            (*activeDicts)[ x ]->getResource(
-              url.path().mid( 1 ).toUtf8().data() );
-
-          if ( req->isFinished() && req->dataSize() >= 0 )
+          try
           {
-            // A request was instantly finished with success.
-            // If we've managed to spawn some lingering requests already,
-            // erase them.
-            resourceDownloadRequests.clear();
-
-            // Handle the result
-            resourceDownloadRequests.push_back( req );
-            resourceDownloadFinished();
+            sptr< Dictionary::DataRequest > req =
+              (*activeDicts)[ x ]->getResource(
+                url.path().mid( 1 ).toUtf8().data() );
+
+            if ( req->isFinished() && req->dataSize() >= 0 )
+            {
+              // A request was instantly finished with success.
+              // If we've managed to spawn some lingering requests already,
+              // erase them.
+              resourceDownloadRequests.clear();
+
+              // Handle the result
+              resourceDownloadRequests.push_back( req );
+              resourceDownloadFinished();
+
+              return;
+            }
+            else
+            if ( !req->isFinished() )
+            {
+              resourceDownloadRequests.push_back( req );
 
-            return;
+              connect( req.get(), SIGNAL( finished() ),
+                       this, SLOT( resourceDownloadFinished() ) );
+            }
           }
-          else
-          if ( !req->isFinished() )
+          catch( std::exception & e )
           {
-            resourceDownloadRequests.push_back( req );
-
-            connect( req.get(), SIGNAL( finished() ),
-                     this, SLOT( resourceDownloadFinished() ) );
+            emit statusBarMessage(
+                  tr( "ERROR: %1" ).arg( e.what() ),
+                  10000, QPixmap( ":/icons/error.png" ) );
           }
         }
     }
@@ -971,7 +1201,7 @@
   if ( url.scheme() == "gdtts" )
   {
 // TODO: Port TTS
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
     // Text to speech
     QString md5Id = url.queryItemValue( "engine" );
     QString text( url.path().mid( 1 ) );
@@ -1039,11 +1269,19 @@
       {
         for( unsigned x = 0; x < activeDicts->size(); ++x )
         {
-          req = (*activeDicts)[ x ]->getResource(
-                  url.path().mid( 1 ).toUtf8().data() );
+          try
+          {
+            req = (*activeDicts)[ x ]->getResource(
+                    url.path().mid( 1 ).toUtf8().data() );
 
-          ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName );
-          handlers.push_back( handler );
+            ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName );
+            handlers.push_back( handler );
+          }
+          catch( std::exception & e )
+          {
+            gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
+                       (*activeDicts)[ x ]->getName().c_str() );
+          }
         }
       }
     }
@@ -1053,8 +1291,11 @@
       QString contentType;
       req = articleNetMgr.getResource( url, contentType );
 
-      ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName );
-      handlers.push_back( handler );
+      if( req.get() )
+      {
+        ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName );
+        handlers.push_back( handler );
+      }
     }
   }
   else
@@ -1676,6 +1917,12 @@
 
 void ArticleView::openSearch()
 {
+  if( !isVisible() )
+    return;
+
+  if( ftsSearchIsOpened )
+    closeSearch();
+
   if ( !searchIsOpened )
   {
     ui.searchFrame->show();
@@ -1690,7 +1937,7 @@
   if ( ui.definition->selectedText().size() )
   {
     ui.definition->page()->currentFrame()->
-           evaluateJavaScript( "window.getSelection().removeAllRanges();" );
+           evaluateJavaScript( "window.getSelection().removeAllRanges();_=0;" );
   }
 
   if ( ui.searchText->property( "noResults" ).toBool() )
@@ -1744,7 +1991,7 @@
   if ( !id.startsWith( "gdfrom-" ) )
     return; // Incorrect id
 
-  emit activeArticleChanged( id.mid( 7 ) );
+  emit activeArticleChanged( this, id.mid( 7 ) );
 }
 
 void ArticleView::doubleClicked()
@@ -1767,7 +2014,18 @@
                                      getCurrentArticle(), Contexts() );
       }
       else
-        showDefinition( selectedText, getGroup( ui.definition->url() ), getCurrentArticle() );
+      {
+        QUrl const & ref = ui.definition->url();
+
+        if( ref.hasQueryItem( "dictionaries" ) )
+        {
+          QStringList dictsList = ref.queryItemValue( "dictionaries" )
+                                     .split( ",", QString::SkipEmptyParts );
+          showDefinition( selectedText, dictsList, QRegExp(), getGroup( ref ) );
+        }
+        else
+          showDefinition( selectedText, getGroup( ref ), getCurrentArticle() );
+      }
     }
   }
 }
@@ -1785,7 +2043,7 @@
       if ( ui.definition->selectedText().size() )
       {
         ui.definition->page()->currentFrame()->
-               evaluateJavaScript( "window.getSelection().removeAllRanges();" );
+               evaluateJavaScript( "window.getSelection().removeAllRanges();_=0;" );
       }
     }
 
@@ -1849,6 +2107,27 @@
     return true;
   }
   else
+  if( ftsSearchIsOpened )
+  {
+    allMatches.clear();
+    uniqueMatches.clear();
+    ftsPosition = 0;
+    ftsSearchIsOpened = false;
+
+    ui.ftsSearchFrame->hide();
+    ui.definition->setFocus();
+
+    QWebPage::FindFlags flags ( 0 );
+
+  #if QT_VERSION >= 0x040600
+    flags |= QWebPage::HighlightAllOccurrences;
+  #endif
+
+    ui.definition->findText( "", flags );
+
+    return true;
+  }
+  else
     return false;
 }
 
@@ -1863,6 +2142,9 @@
 
   if ( !searchIsOpened )
     ui.searchFrame->hide();
+
+  if( !ftsSearchIsOpened )
+    ui.ftsSearchFrame->hide();
 }
 
 void ArticleView::receiveExpandOptionalParts( bool expand )
@@ -1903,6 +2185,159 @@
   ui.definition->triggerPageAction( QWebPage::InspectElement );
 }
 
+void ArticleView::highlightFTSResults()
+{
+  closeSearch();
+
+  AccentMarkHandler markHandler;
+
+  const QUrl & url = ui.definition->url();
+  QRegExp regexp( url.queryItemValue( "regexp" ).remove( AccentMarkHandler::accentMark() ),
+                  url.hasQueryItem( "matchcase" ) ? Qt::CaseSensitive : Qt::CaseInsensitive,
+                  url.hasQueryItem( "wildcards" ) ? QRegExp::WildcardUnix : QRegExp::RegExp2 );
+
+  if( regexp.pattern().isEmpty() )
+    return;
+
+  regexp.setMinimal( true );
+
+  // Clear any current selection
+  if ( ui.definition->selectedText().size() )
+  {
+    ui.definition->page()->currentFrame()->
+           evaluateJavaScript( "window.getSelection().removeAllRanges();_=0;" );
+  }
+
+  QString pageText = ui.definition->page()->currentFrame()->toPlainText();
+  markHandler.setText( pageText );
+
+  int pos = 0;
+
+  while( pos >= 0 )
+  {
+    pos = regexp.indexIn( markHandler.normalizedText(), pos );
+    if( pos >= 0 )
+    {
+      // Mirror pos and matched length to original string
+      int spos = markHandler.mirrorPosition( pos );
+      int matched = markHandler.mirrorPosition( pos + regexp.matchedLength() ) - spos;
+
+      if( matched > FTS::MaxMatchLengthForHighlightResults )
+      {
+        gdWarning( "ArticleView::highlightFTSResults(): Too long match - skipped (matched length %i, allowed %i)",
+                   regexp.matchedLength(), FTS::MaxMatchLengthForHighlightResults );
+      }
+      else
+        allMatches.append( pageText.mid( spos, matched ) );
+
+      pos += regexp.matchedLength();
+    }
+  }
+
+  ftsSearchMatchCase = url.hasQueryItem( "matchcase" );
+
+  QWebPage::FindFlags flags ( 0 );
+
+  if( ftsSearchMatchCase )
+    flags |= QWebPage::FindCaseSensitively;
+
+#if QT_VERSION >= 0x040600
+  flags |= QWebPage::HighlightAllOccurrences;
+
+  for( int x = 0; x < allMatches.size(); x++ )
+    ui.definition->findText( allMatches.at( x ), flags );
+
+  flags &= ~QWebPage::HighlightAllOccurrences;
+#endif
+
+  if( !allMatches.isEmpty() )
+  {
+    if( ui.definition->findText( allMatches.at( 0 ), flags ) )
+    {
+        ui.definition->page()->currentFrame()->
+               evaluateJavaScript( QString( "%1=window.getSelection().getRangeAt(0);_=0;" )
+                                   .arg( rangeVarName ) );
+    }
+  }
+
+  ui.ftsSearchFrame->show();
+  ui.ftsSearchPrevious->setEnabled( false );
+  ui.ftsSearchNext->setEnabled( !allMatches.isEmpty() );
+
+  ftsSearchIsOpened = true;
+}
+
+void ArticleView::performFtsFindOperation( bool backwards )
+{
+  if( !ftsSearchIsOpened )
+    return;
+
+  if( allMatches.isEmpty() )
+  {
+    ui.ftsSearchNext->setEnabled( false );
+    ui.ftsSearchPrevious->setEnabled( false );
+    return;
+  }
+
+  QWebPage::FindFlags flags( 0 );
+
+  if( ftsSearchMatchCase )
+    flags |= QWebPage::FindCaseSensitively;
+
+
+  // Restore saved highlighted selection
+  ui.definition->page()->currentFrame()->
+         evaluateJavaScript( QString( "var sel=window.getSelection();sel.removeAllRanges();sel.addRange(%1);_=0;" )
+                             .arg( rangeVarName ) );
+
+  bool res;
+  if( backwards )
+  {
+    if( ftsPosition > 0 )
+    {
+      res = ui.definition->findText( allMatches.at( ftsPosition - 1 ),
+                                     flags | QWebPage::FindBackward );
+      ftsPosition -= 1;
+    }
+    else
+      res = ui.definition->findText( allMatches.at( ftsPosition ),
+                                     flags | QWebPage::FindBackward );
+
+    ui.ftsSearchPrevious->setEnabled( res );
+    if( !ui.ftsSearchNext->isEnabled() )
+      ui.ftsSearchNext->setEnabled( res );
+  }
+  else
+  {
+    if( ftsPosition < allMatches.size() - 1 )
+    {
+      res = ui.definition->findText( allMatches.at( ftsPosition + 1 ), flags );
+      ftsPosition += 1;
+    }
+    else
+      res = ui.definition->findText( allMatches.at( ftsPosition ), flags );
+
+    ui.ftsSearchNext->setEnabled( res );
+    if( !ui.ftsSearchPrevious->isEnabled() )
+      ui.ftsSearchPrevious->setEnabled( res );
+  }
+
+  // Store new highlighted selection
+  ui.definition->page()->currentFrame()->
+         evaluateJavaScript( QString( "%1=window.getSelection().getRangeAt(0);_=0;" )
+                             .arg( rangeVarName ) );
+}
+
+void ArticleView::on_ftsSearchPrevious_clicked()
+{
+  performFtsFindOperation( true );
+}
+
+void ArticleView::on_ftsSearchNext_clicked()
+{
+  performFtsFindOperation( false );
+}
+
 #ifdef Q_OS_WIN32
 
 void ArticleView::readTag( const QString & from, QString & to, int & count )
diff -Nru goldendict-1.5.0~git20131003/articleview.hh goldendict-1.5.0~git20150923/articleview.hh
--- goldendict-1.5.0~git20131003/articleview.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/articleview.hh	2015-09-23 08:26:24.000000000 +0000
@@ -30,11 +30,13 @@
   Ui::ArticleView ui;
 
   QAction pasteAction, articleUpAction, articleDownAction,
-          goBackAction, goForwardAction, openSearchAction, selectCurrentArticleAction,
+          goBackAction, goForwardAction, selectCurrentArticleAction,
           copyAsTextAction, inspectAction;
+  QAction & openSearchAction;
   bool searchIsOpened;
   bool expandOptionalParts;
   QString articleToJump;
+  QString rangeVarName;
 
   /// Any resource we've decided to download off the dictionary gets stored here.
   /// Full vector capacity is used for search requests, where we have to make
@@ -49,6 +51,16 @@
   QAction * dictionaryBarToggled;
   GroupComboBox const * groupComboBox;
 
+  /// Search in results of full-text search
+  QStringList allMatches;
+  QStringList uniqueMatches;
+  bool ftsSearchIsOpened, ftsSearchMatchCase;
+  int ftsPosition;
+
+  void highlightFTSResults();
+  void performFtsFindOperation( bool backwards );
+  void showFindButtons();
+
 public:
   /// The popupView flag influences contents of the context menus to be
   /// appropriate to the context of the view.
@@ -59,6 +71,7 @@
                Instances::Groups const &,
                bool popupView,
                Config::Class const & cfg,
+               QAction & openSearchAction_,
                QAction * dictionaryBarToggled = 0,
                GroupComboBox const * groupComboBox = 0 );
 
@@ -83,6 +96,9 @@
                        QString const & scrollTo = QString(),
                        Contexts const & contexts = Contexts() );
 
+  void showDefinition( QString const & word, QStringList const & dictIDs,
+                       QRegExp const & searchRegExp, unsigned group );
+
   /// Clears the view and sets the application-global waiting cursor,
   /// which will be restored when some article loads eventually.
   void showAnticipation();
@@ -196,7 +212,7 @@
   /// typically in response to user actions
   /// (clicking on the article or using shortcuts).
   /// id - the dictionary id of the active article.
-  void activeArticleChanged ( QString const & id );
+  void activeArticleChanged ( ArticleView const *, QString const & id );
 
   /// Signal to add word to history even if history is disabled
   void forceAddWordToHistory( const QString & word);
@@ -211,6 +227,9 @@
 
   void storeResourceSavePath(QString const & );
 
+  void zoomIn();
+  void zoomOut();
+
 public slots:
 
   void on_searchPrevious_clicked();
@@ -258,6 +277,9 @@
   void on_searchCaseSensitive_clicked();
   void on_highlightAllButton_clicked();
 
+  void on_ftsSearchPrevious_clicked();
+  void on_ftsSearchNext_clicked();
+
   /// Handles the double-click from the definition.
   void doubleClicked();
 
diff -Nru goldendict-1.5.0~git20131003/articleview.ui goldendict-1.5.0~git20150923/articleview.ui
--- goldendict-1.5.0~git20131003/articleview.ui	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/articleview.ui	2015-09-23 08:26:24.000000000 +0000
@@ -13,8 +13,17 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1000,0">
-   <property name="margin">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1000,0,0">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -26,7 +35,16 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -40,6 +58,56 @@
       </item>
      </layout>
     </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="ftsSearchFrame">
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QToolButton" name="ftsSearchPrevious">
+        <property name="text">
+         <string>&amp;Previous</string>
+        </property>
+        <property name="icon">
+         <iconset resource="resources.qrc">
+          <normaloff>:/icons/previous.png</normaloff>:/icons/previous.png</iconset>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="ftsSearchNext">
+        <property name="text">
+         <string>&amp;Next</string>
+        </property>
+        <property name="icon">
+         <iconset resource="resources.qrc">
+          <normaloff>:/icons/next.png</normaloff>:/icons/next.png</iconset>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QFrame" name="searchFrame">
diff -Nru goldendict-1.5.0~git20131003/authentication.ui goldendict-1.5.0~git20150923/authentication.ui
--- goldendict-1.5.0~git20131003/authentication.ui	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/authentication.ui	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>389</width>
+    <height>120</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Proxy authentication required</string>
+  </property>
+  <layout class="QGridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>You need to supply a Username and a Password to access via proxy</string>
+     </property>
+     <property name="wordWrap">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="userEdit"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="passwordEdit">
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff -Nru goldendict-1.5.0~git20131003/bgl_babylon.cc goldendict-1.5.0~git20150923/bgl_babylon.cc
--- goldendict-1.5.0~git20131003/bgl_babylon.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/bgl_babylon.cc	2015-09-23 08:26:24.000000000 +0000
@@ -28,12 +28,13 @@
 #include <stdio.h>
 #include <iconv.h>
 #include <QTextDocument>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "ufile.hh"
 #include "iconv.hh"
 #include "htmlescape.hh"
 #include <QString>
 #include <QDebug>
+#include "dictionary.hh"
 
 #ifdef _WIN32
 #include <io.h>
@@ -44,6 +45,11 @@
 
 using std::string;
 
+DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
+DEF_EX( exIconv, "Iconv library error", Dictionary::Ex )
+DEF_EX( exAllocation, "Error memory allocation", Dictionary::Ex )
+
 Babylon::Babylon( std::string filename ) :
 m_filename( filename )
 {
@@ -100,7 +106,7 @@
 
   fflush( f );
 
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MAC
   /* Under Mac OS X the above technique don't set reopen position properly */
   int fn = DUP( fileno( f ) );
   lseek( fn, i, SEEK_SET );
@@ -141,6 +147,9 @@
   if( block.length )
   {
     block.data = (char *)malloc( block.length );
+    if( !block.data )
+      throw exAllocation();
+
     unsigned res = gzread( file, block.data, block.length );
     if( block.length != res )
     {
@@ -315,7 +324,7 @@
   convertToUtf8( m_email, TARGET_CHARSET );
   convertToUtf8( m_copyright, TARGET_CHARSET );
   convertToUtf8( m_description, TARGET_CHARSET );
-  DPRINTF("Default charset: %s\nSource Charset: %s\nTargetCharset: %s\n", m_defaultCharset.c_str(), m_sourceCharset.c_str(), m_targetCharset.c_str());
+  GD_DPRINTF("Default charset: %s\nSource Charset: %s\nTargetCharset: %s\n", m_defaultCharset.c_str(), m_sourceCharset.c_str(), m_targetCharset.c_str());
   return true;
 }
 
@@ -495,7 +504,7 @@
 
             if ( length > len - a - 2 )
             {
-              FDPRINTF( stderr, "Hidden displayed headword is too large %s\n", headword.c_str() );
+              GD_FDPRINTF( stderr, "Hidden displayed headword is too large %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -510,7 +519,7 @@
 
             if ( length > len - a - 2 )
             {
-              FDPRINTF( stderr, "Displayed headword's length is too large for headword %s\n", headword.c_str() );
+              GD_FDPRINTF( stderr, "Displayed headword's length is too large for headword %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -530,7 +539,7 @@
 
             if ( length > len - a - 3 )
             {
-              FDPRINTF( stderr, "2-byte sized displayed headword for %s is too large\n", headword.c_str() );
+              GD_FDPRINTF( stderr, "2-byte sized displayed headword for %s is too large\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -548,7 +557,7 @@
 
             if ( length > len - a - 3 )
             {
-              FDPRINTF( stderr, "1-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
+              GD_FDPRINTF( stderr, "1-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -561,7 +570,7 @@
               }
               catch( Iconv::Ex & e )
               {
-                qWarning() << "Bgl: charset convertion error, no trancription processing's done: " << e.what();
+                qWarning( "Bgl: charset convertion error, no trancription processing's done: %s\n", e.what() );
                 transcription = std::string( block.data + pos + 3, length );
               }
             }
@@ -581,7 +590,7 @@
 
             if ( length > len - a - 4)
             {
-              FDPRINTF( stderr, "2-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
+              GD_FDPRINTF( stderr, "2-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -594,7 +603,7 @@
               }
               catch( Iconv::Ex & e )
               {
-                qWarning() << "Bgl: charset convertion error, no trancription processing's done: " << e.what();
+                qWarning( "Bgl: charset convertion error, no trancription processing's done: %s\n", e.what() );
                 transcription = std::string( block.data + pos + 4, length );
               }
             }
@@ -614,7 +623,7 @@
 
             if ( length > len - a - 2 )
             {
-              FDPRINTF( stderr, "Hidden transcription is too large %s\n", headword.c_str() );
+              GD_FDPRINTF( stderr, "Hidden transcription is too large %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -786,10 +795,7 @@
 
   iconv_t cd = iconv_open( "UTF-8", charset.c_str() );
   if( cd == (iconv_t)(-1) )
-  {
-    qFatal( "Error openning iconv library" );
-    exit(1);
-  }
+    throw exIconv();
 
   char *outbuf, *defbuf;
   size_t inbufbytes, outbufbytes;
@@ -800,11 +806,17 @@
   char *inbuf;
   inbuf = (char *)s.data();
   outbuf = (char*)malloc( outbufbytes + 1 );
+  if( !outbuf )
+  {
+    iconv_close( cd );
+    throw exAllocation();
+  }
+
   memset( outbuf, '\0', outbufbytes + 1 );
   defbuf = outbuf;
   while (inbufbytes) {
     if (iconv(cd, &inbuf, &inbufbytes, &outbuf, &outbufbytes) == (size_t)-1) {
-      qWarning() << "\"" << inbuf << "\" - error in iconv conversion";
+      gdWarning( "\"%s\" - error in iconv conversion\n", inbuf );
       break;
 //      inbuf++;
 //      inbufbytes--;
diff -Nru goldendict-1.5.0~git20131003/bgl.cc goldendict-1.5.0~git20150923/bgl.cc
--- goldendict-1.5.0~git20131003/bgl.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/bgl.cc	2015-09-23 08:26:24.000000000 +0000
@@ -10,9 +10,10 @@
 #include "chunkedstorage.hh"
 #include "langcoder.hh"
 #include "language.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "fsencoding.hh"
 #include "htmlescape.hh"
+#include "ftshelpers.hh"
 
 #include <map>
 #include <set>
@@ -198,7 +199,7 @@
 
     if ( result < 0 )
     {
-      qWarning( "Failed to decode utf8 of headword \"%s\", skipping it.", word.c_str() );
+      gdWarning( "Failed to decode utf8 of headword \"%s\", skipping it.", word.c_str() );
       return;
     }
 
@@ -251,8 +252,23 @@
     virtual sptr< Dictionary::DataRequest > getResource( string const & name )
       throw( std::exception );
 
+    virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                              int searchMode, bool matchCase,
+                                                              int distanceBetweenWords,
+                                                              int maxResults );
     virtual QString const& getDescription();
 
+    virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+    virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+    virtual void setFTSParameters( Config::FullTextSearch const & fts )
+    {
+      can_FTS = fts.enabled
+                && !fts.disabledTypes.contains( "BGL", Qt::CaseInsensitive )
+                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    }
+
   protected:
 
     virtual void loadIcon() throw();
@@ -295,6 +311,14 @@
     openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
                         idxHeader.indexRootOffset ),
                idx, idxMutex );
+
+    can_FTS = true;
+
+    ftsIdxName = indexFile + "_FTS";
+
+    if( !Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+      FTS_index_completed.ref();
   }
 
   void BglDictionary::loadIcon() throw()
@@ -382,6 +406,7 @@
       dictionaryDescription = "NONE";
     else
     {
+      Mutex::Lock _( idxMutex );
       vector< char > chunk;
       char * dictDescription = chunks.getBlock( idxHeader.descriptionAddress, chunk );
       string str( dictDescription );
@@ -407,6 +432,74 @@
     return dictionaryDescription;
   }
 
+  void BglDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+  {
+    try
+    {
+      string headwordStr, displayedHeadwordStr, articleStr;
+      loadArticle( articleAddress, headwordStr, displayedHeadwordStr, articleStr );
+
+      // Some headword normalization similar while indexing
+      trimWs( headwordStr );
+
+      if ( headwordStr.size() && headwordStr[ 0 ] == '/' )
+        headwordStr.erase(); // We will take headword from index later
+
+      if ( headwordStr.size()
+           && headwordStr[ headwordStr.size() - 1 ] == '$' )
+      {
+        headwordStr = removePostfix( headwordStr );
+        trimWs( headwordStr );
+      }
+
+      headword = QString::fromUtf8( headwordStr.data(), headwordStr.size() );
+
+      wstring wstr = Utf8::decode( articleStr );
+
+      if ( getLangTo() == LangCoder::code2toInt( "he" ) )
+      {
+        for ( unsigned int i = 0; i < wstr.size(); i++ )
+        {
+          if ( (wstr[ i ] >= 224 && wstr[ i ] <= 250) || (wstr[ i ] >= 192 && wstr[ i ] <= 210) ) // Hebrew chars encoded ecoded as windows-1255 or ISO-8859-8, or as vowel-points of windows-1255
+            wstr[ i ] += 1488 - 224; // Convert to Hebrew unicode
+        }
+      }
+
+      text = Html::unescape( gd::toQString( wstr ) );
+    }
+    catch( std::exception &ex )
+    {
+      gdWarning( "BGL: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    }
+  }
+
+  void BglDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+  {
+    if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+           || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+      FTS_index_completed.ref();
+
+    if( haveFTSIndex() )
+      return;
+
+    if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+      return;
+
+    gdDebug( "Bgl: Building the full-text index for dictionary: %s\n",
+             getName().c_str() );
+
+    try
+    {
+      FtsHelpers::makeFTSIndex( this, isCancelled );
+      FTS_index_completed.ref();
+    }
+    catch( std::exception &ex )
+    {
+      gdWarning( "Bgl: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+      QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+    }
+  }
+
 /// BglDictionary::findHeadwordsForSynonym()
 
 class BglHeadwordsRequest;
@@ -636,7 +729,7 @@
 
   for (unsigned int i=0; i<hebWStr.size();i++)
   {
-    if (hebWStr[i]>=224 && hebWStr[i]<=250) // Hebrew chars encoded ecoded as windows-1255 or ISO-8859-8
+    if ( (hebWStr[ i ] >= 224 && hebWStr[ i ] <= 250) || (hebWStr[ i ] >= 192 && hebWStr[ i ] <= 210) ) // Hebrew chars encoded ecoded as windows-1255 or ISO-8859-8, or as vowel-points of windows-1255
         hebWStr[i]+=1488-224; // Convert to Hebrew unicode
   }
   hebStr=Utf8::encode(hebWStr);
@@ -748,7 +841,7 @@
     } // try
     catch( std::exception &ex )
     {
-      qWarning( "BGL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      gdWarning( "BGL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
     }
   }
 
@@ -807,7 +900,7 @@
            .replace( QRegExp( "(<\\s*a\\s+[^>]*href\\s*=\\s*[\"']\\s*)bword://", Qt::CaseInsensitive ),
                      "\\1bword:" )
           //remove invalid width, height attrs
-          .replace(QRegExp( "(width)|(height)\\s*=\\s*[\"']\\d{7,}[\"'']" ),
+          .replace(QRegExp( "(width|height)\\s*=\\s*[\"']\\d{7,}[\"'']" ),
                    "" )
           //remove invalid <br> tag
           .replace( QRegExp( "<br>(<div|<table|<tbody|<tr|<td|</div>|</table>|</tbody>|</tr>|</td>|function addScript|var scNode|scNode|var atag|while\\(atag|atag=atag|document\\.getElementsByTagName|addScript|src=\"bres|<a onmouseover=\"return overlib|onclick=\"return overlib)", Qt::CaseInsensitive ),
@@ -961,7 +1054,7 @@
                        compressedData.size() ) != Z_OK ||
            decompressedLength != data.size() )
       {
-        qWarning( "Failed to decompress resource \"%s\", ignoring it.\n", name.c_str() );
+        gdWarning( "Failed to decompress resource \"%s\", ignoring it.\n", name.c_str() );
       }
       else
         hasAnyData = true;
@@ -1042,7 +1135,7 @@
     if ( compress( &compressedData.front(), &compressedSize,
                    (unsigned char const *) data, size ) != Z_OK )
     {
-      qWarning( "Failed to compress the body of resource \"%s\", dropping it.\n", filename.c_str() );
+      gdWarning( "Failed to compress the body of resource \"%s\", dropping it.\n", filename.c_str() );
       return;
     }
 
@@ -1054,6 +1147,13 @@
   }
 }
 
+sptr< Dictionary::DataRequest > BglDictionary::getSearchResults( QString const & searchString,
+                                                                 int searchMode, bool matchCase,
+                                                                 int distanceBetweenWords,
+                                                                 int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
 
 
 vector< sptr< Dictionary::Class > > makeDictionaries(
@@ -1086,151 +1186,167 @@
     {
       // Building the index
 
-      qDebug() << "Bgl: Building the index for dictionary: " << i->c_str();
+      gdDebug( "Bgl: Building the index for dictionary: %s\n", i->c_str() );
 
-      Babylon b( *i );
+      try
+      {
+        Babylon b( *i );
 
-      if ( !b.open() )
-        continue;
+        if ( !b.open() )
+          continue;
 
-      std::string sourceCharset, targetCharset;
+        std::string sourceCharset, targetCharset;
 
-      if ( !b.read( sourceCharset, targetCharset ) )
-      {
-        qWarning( "Failed to start reading from %s, skipping it\n", i->c_str() );
-        continue;
-      }
+        if ( !b.read( sourceCharset, targetCharset ) )
+        {
+          gdWarning( "Failed to start reading from %s, skipping it\n", i->c_str() );
+          continue;
+        }
 
-      initializing.indexingDictionary( b.title() );
+        initializing.indexingDictionary( b.title() );
 
-      File::Class idx( indexFile, "wb" );
+        File::Class idx( indexFile, "wb" );
 
-      IdxHeader idxHeader;
+        IdxHeader idxHeader;
 
-      memset( &idxHeader, 0, sizeof( idxHeader ) );
+        memset( &idxHeader, 0, sizeof( idxHeader ) );
 
-      // We write a dummy header first. At the end of the process the header
-      // will be rewritten with the right values.
+        // We write a dummy header first. At the end of the process the header
+        // will be rewritten with the right values.
 
-      idx.write( idxHeader );
+        idx.write( idxHeader );
 
-      idx.write< uint32_t >( b.title().size() );
-      idx.write( b.title().data(), b.title().size() );
+        idx.write< uint32_t >( b.title().size() );
+        idx.write( b.title().data(), b.title().size() );
 
-      // This is our index data that we accumulate during the loading process.
-      // For each new word encountered, we emit the article's body to the file
-      // immediately, inserting the word itself and its offset in this map.
-      // This map maps folded words to the original words and the corresponding
-      // articles' offsets.
-      IndexedWords indexedWords;
+        // This is our index data that we accumulate during the loading process.
+        // For each new word encountered, we emit the article's body to the file
+        // immediately, inserting the word itself and its offset in this map.
+        // This map maps folded words to the original words and the corresponding
+        // articles' offsets.
+        IndexedWords indexedWords;
 
-      // We use this buffer to decode utf8 into it.
-      vector< wchar > wcharBuffer;
+        // We use this buffer to decode utf8 into it.
+        vector< wchar > wcharBuffer;
 
-      ChunkedStorage::Writer chunks( idx );
+        ChunkedStorage::Writer chunks( idx );
 
-      uint32_t articleCount = 0, wordCount = 0;
+        uint32_t articleCount = 0, wordCount = 0;
 
-      ResourceHandler resourceHandler( idx );
+        ResourceHandler resourceHandler( idx );
 
-      b.setResourcePrefix( string( "bres://" ) + dictId + "/" );
+        b.setResourcePrefix( string( "bres://" ) + dictId + "/" );
 
-      // Save icon if there's one
-      if ( size_t sz = b.getIcon().size() )
-      {
-        idxHeader.iconAddress = chunks.startNewBlock();
-        chunks.addToBlock( &b.getIcon().front(), sz );
-        idxHeader.iconSize = sz;
-      }
-      
-      // Save dictionary description if there's one
-      idxHeader.descriptionSize = 0;
-      idxHeader.descriptionAddress = chunks.startNewBlock();
+        // Save icon if there's one
+        if ( size_t sz = b.getIcon().size() )
+        {
+          idxHeader.iconAddress = chunks.startNewBlock();
+          chunks.addToBlock( &b.getIcon().front(), sz );
+          idxHeader.iconSize = sz;
+        }
 
-      chunks.addToBlock( b.copyright().c_str(), b.copyright().size() + 1 );
-      idxHeader.descriptionSize += b.copyright().size() + 1;
+        // Save dictionary description if there's one
+        idxHeader.descriptionSize = 0;
+        idxHeader.descriptionAddress = chunks.startNewBlock();
 
-      chunks.addToBlock( b.author().c_str(), b.author().size() + 1 );
-      idxHeader.descriptionSize += b.author().size() + 1;
+        chunks.addToBlock( b.copyright().c_str(), b.copyright().size() + 1 );
+        idxHeader.descriptionSize += b.copyright().size() + 1;
 
-      chunks.addToBlock( b.email().c_str(), b.email().size() + 1 );
-      idxHeader.descriptionSize += b.email().size() + 1;
+        chunks.addToBlock( b.author().c_str(), b.author().size() + 1 );
+        idxHeader.descriptionSize += b.author().size() + 1;
 
-      chunks.addToBlock( b.description().c_str(), b.description().size() + 1 );
-      idxHeader.descriptionSize += b.description().size() + 1;
+        chunks.addToBlock( b.email().c_str(), b.email().size() + 1 );
+        idxHeader.descriptionSize += b.email().size() + 1;
 
-      for( ; ; )
-      {
-        bgl_entry e = b.readEntry( &resourceHandler );
+        chunks.addToBlock( b.description().c_str(), b.description().size() + 1 );
+        idxHeader.descriptionSize += b.description().size() + 1;
 
-        if ( e.headword.empty() )
-          break;
+        for( ; ; )
+        {
+          bgl_entry e = b.readEntry( &resourceHandler );
 
-        // Save the article's body itself first
+          if ( e.headword.empty() )
+            break;
 
-        uint32_t articleAddress = chunks.startNewBlock();
+          // Save the article's body itself first
 
-        chunks.addToBlock( e.headword.c_str(), e.headword.size() + 1 );
-        chunks.addToBlock( e.displayedHeadword.c_str(), e.displayedHeadword.size() + 1 );
-        chunks.addToBlock( e.definition.c_str(), e.definition.size() + 1 );
+          uint32_t articleAddress = chunks.startNewBlock();
 
-        // Add entries to the index
+          chunks.addToBlock( e.headword.c_str(), e.headword.size() + 1 );
+          chunks.addToBlock( e.displayedHeadword.c_str(), e.displayedHeadword.size() + 1 );
+          chunks.addToBlock( e.definition.c_str(), e.definition.size() + 1 );
 
-        addEntryToIndex( e.headword, articleAddress, indexedWords, wcharBuffer );
+          // Add entries to the index
 
-        for( unsigned x = 0; x < e.alternates.size(); ++x )
-          addEntryToIndex( e.alternates[ x ], articleAddress, indexedWords, wcharBuffer );
+          addEntryToIndex( e.headword, articleAddress, indexedWords, wcharBuffer );
 
-        wordCount += 1 + e.alternates.size();
-        ++articleCount;
-      }
+          for( unsigned x = 0; x < e.alternates.size(); ++x )
+            addEntryToIndex( e.alternates[ x ], articleAddress, indexedWords, wcharBuffer );
 
-      // Finish with the chunks
+          wordCount += 1 + e.alternates.size();
+          ++articleCount;
+        }
 
-      idxHeader.chunksOffset = chunks.finish();
+        // Finish with the chunks
 
-      DPRINTF( "Writing index...\n" );
+        idxHeader.chunksOffset = chunks.finish();
 
-      // Good. Now build the index
+        GD_DPRINTF( "Writing index...\n" );
 
-      IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
+        // Good. Now build the index
 
-      idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-      idxHeader.indexRootOffset = idxInfo.rootOffset;
+        IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
-      // Save the resource's list.
+        idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
+        idxHeader.indexRootOffset = idxInfo.rootOffset;
 
-      idxHeader.resourceListOffset = idx.tell();
-      idxHeader.resourcesCount = resourceHandler.getResources().size();
+        // Save the resource's list.
 
-      for( list< pair< string, uint32_t > >::const_iterator j =
-          resourceHandler.getResources().begin();
-           j != resourceHandler.getResources().end(); ++j )
-      {
-        idx.write< uint32_t >( j->first.size() );
-        idx.write( j->first.data(), j->first.size() );
-        idx.write< uint32_t >( j->second );
-      }
+        idxHeader.resourceListOffset = idx.tell();
+        idxHeader.resourcesCount = resourceHandler.getResources().size();
+
+        for( list< pair< string, uint32_t > >::const_iterator j =
+            resourceHandler.getResources().begin();
+             j != resourceHandler.getResources().end(); ++j )
+        {
+          idx.write< uint32_t >( j->first.size() );
+          idx.write( j->first.data(), j->first.size() );
+          idx.write< uint32_t >( j->second );
+        }
 
-      // That concludes it. Update the header.
+        // That concludes it. Update the header.
 
-      idxHeader.signature = Signature;
-      idxHeader.formatVersion = CurrentFormatVersion;
-      idxHeader.parserVersion = Babylon::ParserVersion;
-      idxHeader.foldingVersion = Folding::Version;
-      idxHeader.articleCount = articleCount;
-      idxHeader.wordCount = wordCount;
-      idxHeader.langFrom = b.sourceLang();//LangCoder::findIdForLanguage( Utf8::decode( b.sourceLang() ) );
-      idxHeader.langTo = b.targetLang();//LangCoder::findIdForLanguage( Utf8::decode( b.targetLang() ) );
+        idxHeader.signature = Signature;
+        idxHeader.formatVersion = CurrentFormatVersion;
+        idxHeader.parserVersion = Babylon::ParserVersion;
+        idxHeader.foldingVersion = Folding::Version;
+        idxHeader.articleCount = articleCount;
+        idxHeader.wordCount = wordCount;
+        idxHeader.langFrom = b.sourceLang();//LangCoder::findIdForLanguage( Utf8::decode( b.sourceLang() ) );
+        idxHeader.langTo = b.targetLang();//LangCoder::findIdForLanguage( Utf8::decode( b.targetLang() ) );
 
-      idx.rewind();
+        idx.rewind();
 
-      idx.write( &idxHeader, sizeof( idxHeader ) );
+        idx.write( &idxHeader, sizeof( idxHeader ) );
+      }
+      catch( std::exception & e )
+      {
+        gdWarning( "BGL dictionary indexing failed: %s, error: %s\n",
+                   i->c_str(), e.what() );
+      }
     }
 
-    dictionaries.push_back( new BglDictionary( dictId,
-                                               indexFile,
-                                               *i ) );
+    try
+    {
+      dictionaries.push_back( new BglDictionary( dictId,
+                                                 indexFile,
+                                                 *i ) );
+    }
+    catch( std::exception & e )
+    {
+      gdWarning( "BGL dictionary initializing failed: %s, error: %s\n",
+                 i->c_str(), e.what() );
+    }
   }
 
   return dictionaries;
diff -Nru goldendict-1.5.0~git20131003/btreeidx.cc goldendict-1.5.0~git20150923/btreeidx.cc
--- goldendict-1.5.0~git20131003/btreeidx.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/btreeidx.cc	2015-09-23 08:26:24.000000000 +0000
@@ -10,7 +10,7 @@
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "wstring_qt.hh"
 
 //#define __BTREE_USE_LZO
@@ -38,6 +38,7 @@
 
 using gd::wstring;
 using gd::wchar;
+using std::pair;
 
 enum
 {
@@ -76,15 +77,15 @@
   rootNode.clear();
 }
 
-vector< WordArticleLink > BtreeIndex::findArticles( wstring const & str )
+vector< WordArticleLink > BtreeIndex::findArticles( wstring const & word )
 {
   vector< WordArticleLink > result;
 
   try
   {
-    wstring folded = Folding::apply( str );
+    wstring folded = Folding::apply( word );
     if( folded.empty() )
-      folded = Folding::applyWhitespaceOnly( str );
+      folded = Folding::applyWhitespaceOnly( word );
 
     bool exactMatch;
 
@@ -101,12 +102,12 @@
     {
       result = readChain( chainOffset );
 
-      antialias( str, result );
+      antialias( word, result );
     }
   }
   catch( std::exception & e )
   {
-    qWarning( "Articles searching failed, error: %s\n", e.what() );
+    gdWarning( "Articles searching failed, error: %s\n", e.what() );
     result.clear();
   }
   catch(...)
@@ -118,8 +119,6 @@
   return result;
 }
 
-class BtreeWordSearchRequest;
-  
 class BtreeWordSearchRunnable: public QRunnable
 {
   BtreeWordSearchRequest & r;
@@ -140,74 +139,138 @@
   virtual void run();
 };
 
-class BtreeWordSearchRequest: public Dictionary::WordSearchRequest
+void BtreeWordSearchRunnable::run()
 {
-  friend class BtreeWordSearchRunnable;
-
-  BtreeDictionary & dict;
-  wstring str;
-  unsigned long maxResults;
-  unsigned minLength;
-  int maxSuffixVariation;
-  bool allowMiddleMatches;
-  QAtomicInt isCancelled;
-  QSemaphore hasExited;
-
-public:
+  r.run();
+}
 
-  BtreeWordSearchRequest( BtreeDictionary & dict_,
-                          wstring const & str_,
-                          unsigned minLength_,
-                          int maxSuffixVariation_,
-                          bool allowMiddleMatches_,
-                          unsigned long maxResults_ ):
-    dict( dict_ ), str( str_ ),
-    maxResults( maxResults_ ),
-    minLength( minLength_ ),
-    maxSuffixVariation( maxSuffixVariation_ ),
-    allowMiddleMatches( allowMiddleMatches_ )
+BtreeWordSearchRequest::BtreeWordSearchRequest( BtreeDictionary & dict_,
+                                                wstring const & str_,
+                                                unsigned minLength_,
+                                                int maxSuffixVariation_,
+                                                bool allowMiddleMatches_,
+                                                unsigned long maxResults_,
+                                                bool startRunnable ):
+  dict( dict_ ), str( str_ ),
+  maxResults( maxResults_ ),
+  minLength( minLength_ ),
+  maxSuffixVariation( maxSuffixVariation_ ),
+  allowMiddleMatches( allowMiddleMatches_ )
+{
+  if( startRunnable )
   {
     QThreadPool::globalInstance()->start(
       new BtreeWordSearchRunnable( *this, hasExited ) );
   }
+}
 
-  void run(); // Run from another thread by BtreeWordSearchRunnable
+void BtreeWordSearchRequest::findMatches()
+{
+  QRegExp regexp;
+  bool useWildcards = false;
+  if( allowMiddleMatches )
+    useWildcards = ( str.find( '*' ) != wstring::npos ||
+                     str.find( '?' ) != wstring::npos ||
+                     str.find( '[' ) != wstring::npos ||
+                     str.find( ']' ) != wstring::npos );
 
-  virtual void cancel()
-  {
-    isCancelled.ref();
-  }
-  
-  ~BtreeWordSearchRequest()
-  {
-    isCancelled.ref();
-    hasExited.acquire();
-  }
-};
+  wstring folded = Folding::apply( str );
 
-void BtreeWordSearchRunnable::run()
-{
-  r.run();
-}
+  int minMatchLength = 0;
 
-void BtreeWordSearchRequest::run()
-{
-  if ( isCancelled )
+  if( useWildcards )
   {
-    finish();
-    return;
-  }
+    regexp.setPattern( gd::toQString( Folding::applyDiacriticsOnly( Folding::applySimpleCaseOnly( str ) ) ) );
+    regexp.setPatternSyntax( QRegExp::WildcardUnix );
+    regexp.setCaseSensitivity( Qt::CaseInsensitive );
 
-  if ( dict.ensureInitDone().size() )
+    bool bNoLetters = folded.empty();
+    wstring foldedWithWildcards;
+
+    if( bNoLetters )
+      foldedWithWildcards = Folding::applyWhitespaceOnly( str );
+    else
+      foldedWithWildcards = Folding::apply( str, useWildcards );
+
+    // Calculate minimum match length
+
+    bool insideSet = false;
+    bool escaped = false;
+    for( wstring::size_type x = 0; x < foldedWithWildcards.size(); x++ )
+    {
+      wchar ch = foldedWithWildcards[ x ];
+
+      if( ch == L'\\' && !escaped )
+      {
+        escaped = true;
+        continue;
+      }
+
+      if( ch == L']' && !escaped )
+      {
+        insideSet = false;
+        continue;
+      }
+
+      if( insideSet )
+      {
+        escaped = false;
+        continue;
+      }
+
+      if( ch == L'[' && !escaped )
+      {
+        minMatchLength += 1;
+        insideSet = true;
+        continue;
+      }
+
+      if( ch == L'*' && !escaped )
+        continue;
+
+      escaped = false;
+      minMatchLength += 1;
+    }
+
+    // Fill first match chars
+
+    folded.clear();
+    folded.reserve( foldedWithWildcards.size() );
+    escaped = false;
+    for( wstring::size_type x = 0; x < foldedWithWildcards.size(); x++ )
+    {
+      wchar ch = foldedWithWildcards[ x ];
+
+      if( escaped )
+      {
+        if( bNoLetters || ( ch != L'*' && ch != L'?' && ch != L'[' && ch != L']' ) )
+          folded.push_back( ch );
+        escaped = false;
+        continue;
+      }
+
+      if( ch == L'\\' )
+      {
+        if( bNoLetters || folded.empty() )
+        {
+          escaped = true;
+          continue;
+        }
+        else
+          break;
+      }
+
+      if( ch == '*' || ch == '?' || ch == '[' || ch == ']' )
+        break;
+
+      folded.push_back( ch );
+    }
+  }
+  else
   {
-    setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
-    finish();
-    return;
+    if( folded.empty() )
+      folded = Folding::applyWhitespaceOnly( str );
   }
-  
-  wstring folded = Folding::apply( str );
-  if( folded.empty() )
-    folded = Folding::applyWhitespaceOnly( str );
 
   int initialFoldedSize = folded.size();
 
@@ -254,7 +317,9 @@
         if( resultFolded.empty() )
           resultFolded = Folding::applyWhitespaceOnly( chainHead );
 
-        if ( resultFolded.size() >= folded.size() && !resultFolded.compare( 0, folded.size(), folded ) )
+        if ( ( useWildcards && folded.empty() ) ||
+             ( resultFolded.size() >= folded.size()
+               && !resultFolded.compare( 0, folded.size(), folded ) ) )
         {
           // Exact or prefix match
 
@@ -262,13 +327,30 @@
 
           for( unsigned x = 0; x < chain.size(); ++x )
           {
-            // Skip middle matches, if requested. If suffix variation is specified,
-            // make sure the string isn't larger than requested.
-            if ( ( allowMiddleMatches || Folding::apply( Utf8::decode( chain[ x ].prefix ) ).empty() ) &&
-                 ( maxSuffixVariation < 0 || (int)resultFolded.size() - initialFoldedSize <= maxSuffixVariation ) )
-                matches.push_back( Utf8::decode( chain[ x ].prefix + chain[ x ].word ) );
+            if( useWildcards )
+            {
+              wstring word = Utf8::decode( chain[ x ].prefix + chain[ x ].word );
+              wstring result = Folding::applyDiacriticsOnly( word );
+              if( result.size() >= (wstring::size_type)minMatchLength
+                  && regexp.indexIn( gd::toQString( result ) ) == 0
+                  && regexp.matchedLength() >= minMatchLength )
+              {
+                addMatch( word );
+              }
+            }
+            else
+            {
+              // Skip middle matches, if requested. If suffix variation is specified,
+              // make sure the string isn't larger than requested.
+              if ( ( allowMiddleMatches || Folding::apply( Utf8::decode( chain[ x ].prefix ) ).empty() ) &&
+                   ( maxSuffixVariation < 0 || (int)resultFolded.size() - initialFoldedSize <= maxSuffixVariation ) )
+                  addMatch( Utf8::decode( chain[ x ].prefix + chain[ x ].word ) );
+            }
           }
 
+          if( isCancelled )
+            break;
+
           if ( matches.size() >= maxResults )
           {
             // For now we actually allow more than maxResults if the last
@@ -326,17 +408,41 @@
   }
   catch( std::exception & e )
   {
-    qWarning( "Index searching failed: \"%s\", error: %s\n", e.what(),
-              dict.getName().c_str() );
+    qWarning( "Index searching failed: \"%s\", error: %s\n",
+              dict.getName().c_str(), e.what() );
   }
   catch(...)
   {
-    qWarning( "Index searching failed: \"%s\"\n", dict.getName().c_str() );
+    gdWarning( "Index searching failed: \"%s\"\n", dict.getName().c_str() );
+  }
+}
+
+void BtreeWordSearchRequest::run()
+{
+  if ( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  if ( dict.ensureInitDone().size() )
+  {
+    setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
+    finish();
+    return;
   }
 
+  findMatches();
+
   finish();
 }
 
+BtreeWordSearchRequest::~BtreeWordSearchRequest()
+{
+  isCancelled.ref();
+  hasExited.acquire();
+}
+
 sptr< Dictionary::WordSearchRequest > BtreeDictionary::prefixMatch(
   wstring const & str, unsigned long maxResults )
   throw( std::exception )
@@ -421,6 +527,30 @@
   char const * leaf = &rootNode.front();
   leafEnd = leaf + rootNode.size();
 
+  if( target.empty() )
+  {
+    //For empty target string we return first chain in index
+    for( ; ; )
+    {
+      uint32_t leafEntries = *(uint32_t *)leaf;
+
+      if ( leafEntries == 0xffffFFFF )
+      {
+        // A node
+        currentNodeOffset = *( (uint32_t *)leaf + 1 );
+        readNode( currentNodeOffset, extLeaf );
+        leaf = &extLeaf.front();
+        leafEnd = leaf + extLeaf.size();
+        nextLeaf = idxFile->read< uint32_t >();
+      }
+      else
+      {
+        // A leaf
+        return leaf + sizeof( uint32_t );
+      }
+    }
+  }
+
   for( ; ; )
   {
     // Is it a leaf or a node?
@@ -709,8 +839,6 @@
 
   vector< WordArticleLink > result;
 
-  vector< char > charBuffer;
-
   while( chainSize )
   {
     string str = ptr;
@@ -937,7 +1065,22 @@
   // Safeguard us against various bugs here. Don't attempt adding words
   // which are freakishly huge.
   if ( wordSize > maxHeadwordSize )
+  {
+#define MAX_LOG_WORD_SIZE 500
+    string headword;
+    if( wordSize <= MAX_LOG_WORD_SIZE )
+      headword = Utf8::encode( word );
+    else
+    {
+      std::vector< char > buffer( MAX_LOG_WORD_SIZE * 4 );
+      headword = string( &buffer.front(),
+                         Utf8::encode( wordBegin, MAX_LOG_WORD_SIZE, &buffer.front() ) );
+      headword += "...";
+    }
+    gdWarning( "Skipped too long headword: \"%s\"", headword.c_str() );
     return;
+#undef MAX_LOG_WORD_SIZE
+  }
 
   // Skip any leading whitespace
   while( *wordBegin && Folding::isWhitespace( *wordBegin ) )
@@ -1061,7 +1204,7 @@
   if ( btreeMaxElements > BtreeMaxElements )
     btreeMaxElements = BtreeMaxElements;
 
-  DPRINTF( "Building a tree of %u elements\n", (unsigned) btreeMaxElements );
+  GD_DPRINTF( "Building a tree of %u elements\n", (unsigned) btreeMaxElements );
 
 
   uint32_t lastLeafOffset = 0;
@@ -1073,4 +1216,275 @@
   return IndexInfo( btreeMaxElements, rootOffset );
 }
 
+void BtreeIndex::getAllHeadwords( QSet< QString > & headwords )
+{
+  if ( !idxFile )
+    throw exIndexWasNotOpened();
+
+  findArticleLinks( NULL, NULL, &headwords );
+}
+
+void BtreeIndex::findAllArticleLinks( QVector< WordArticleLink > & articleLinks )
+{
+  if ( !idxFile )
+    throw exIndexWasNotOpened();
+
+  QSet< uint32_t > offsets;
+
+  findArticleLinks( &articleLinks, &offsets, NULL );
+}
+
+void BtreeIndex::findArticleLinks( QVector< WordArticleLink > * articleLinks,
+                                   QSet< uint32_t > * offsets,
+                                   QSet< QString > *headwords,
+                                   QAtomicInt * isCancelled )
+{
+  uint32_t currentNodeOffset = rootOffset;
+  uint32_t nextLeaf = 0;
+  uint32_t leafEntries;
+
+  Mutex::Lock _( *idxFileMutex );
+
+  if ( !rootNodeLoaded )
+  {
+    // Time to load our root node. We do it only once, at the first request.
+    readNode( rootOffset, rootNode );
+    rootNodeLoaded = true;
+  }
+
+  char const * leaf = &rootNode.front();
+  char const * leafEnd = leaf + rootNode.size();
+  char const * chainPtr = 0;
+
+  vector< char > extLeaf;
+
+  // Find first leaf
+
+  for( ; ; )
+  {
+    leafEntries = *(uint32_t *)leaf;
+
+    if( isCancelled && *isCancelled )
+      return;
+
+    if ( leafEntries == 0xffffFFFF )
+    {
+      // A node
+      currentNodeOffset = *( (uint32_t *)leaf + 1 );
+      readNode( currentNodeOffset, extLeaf );
+      leaf = &extLeaf.front();
+      leafEnd = leaf + extLeaf.size();
+      nextLeaf = idxFile->read< uint32_t >();
+    }
+    else
+    {
+      // A leaf
+      chainPtr = leaf + sizeof( uint32_t );
+      break;
+    }
+  }
+
+  if ( !leafEntries )
+  {
+    // Empty leaf? This may only be possible for entirely empty trees only.
+    if ( currentNodeOffset != rootOffset )
+      throw exCorruptedChainData();
+    else
+      return; // No match
+  }
+
+  // Read all chains
+
+  for( ; ; )
+  {
+    vector< WordArticleLink > result = readChain( chainPtr );
+    for( unsigned i = 0; i < result.size(); i++ )
+    {
+      if( isCancelled && *isCancelled )
+        return;
+
+      if( headwords )
+        headwords->insert( QString::fromUtf8( ( result[ i ].prefix + result[ i ].word ).c_str() ) );
+
+      if( offsets && offsets->contains( result[ i ].articleOffset ) )
+        continue;
+
+      if( offsets )
+        offsets->insert( result[ i ].articleOffset );
+
+      if( articleLinks )
+        articleLinks->push_back( WordArticleLink( result[ i ].prefix + result[ i ].word, result[ i ].articleOffset ) );
+    }
+
+    if ( chainPtr >= leafEnd )
+    {
+      // We're past the current leaf, fetch the next one
+
+      if ( nextLeaf )
+      {
+        readNode( nextLeaf, extLeaf );
+        leaf = &extLeaf.front();
+        leafEnd = leaf + extLeaf.size();
+
+        nextLeaf = idxFile->read< uint32_t >();
+        chainPtr = leaf + sizeof( uint32_t );
+
+        leafEntries = *(uint32_t *)leaf;
+
+        if ( leafEntries == 0xffffFFFF )
+          throw exCorruptedChainData();
+      }
+      else
+        break; // That was the last leaf
+    }
+  }
+}
+
+void BtreeIndex::getHeadwordsFromOffsets( QList<uint32_t> & offsets,
+                                          QVector<QString> & headwords,
+                                          QAtomicInt * isCancelled )
+{
+  uint32_t currentNodeOffset = rootOffset;
+  uint32_t nextLeaf = 0;
+  uint32_t leafEntries;
+
+  Mutex::Lock _( *idxFileMutex );
+
+  if ( !rootNodeLoaded )
+  {
+    // Time to load our root node. We do it only once, at the first request.
+    readNode( rootOffset, rootNode );
+    rootNodeLoaded = true;
+  }
+
+  char const * leaf = &rootNode.front();
+  char const * leafEnd = leaf + rootNode.size();
+  char const * chainPtr = 0;
+
+  vector< char > extLeaf;
+
+  // Find first leaf
+
+  for( ; ; )
+  {
+    leafEntries = *(uint32_t *)leaf;
+
+    if( isCancelled && *isCancelled )
+      return;
+
+    if ( leafEntries == 0xffffFFFF )
+    {
+      // A node
+      currentNodeOffset = *( (uint32_t *)leaf + 1 );
+      readNode( currentNodeOffset, extLeaf );
+      leaf = &extLeaf.front();
+      leafEnd = leaf + extLeaf.size();
+      nextLeaf = idxFile->read< uint32_t >();
+    }
+    else
+    {
+      // A leaf
+      chainPtr = leaf + sizeof( uint32_t );
+      break;
+    }
+  }
+
+  if ( !leafEntries )
+  {
+    // Empty leaf? This may only be possible for entirely empty trees only.
+    if ( currentNodeOffset != rootOffset )
+      throw exCorruptedChainData();
+    else
+      return; // No match
+  }
+
+  // Read all chains
+
+  QList< uint32_t >::Iterator begOffsets = offsets.begin();
+  QList< uint32_t >::Iterator endOffsets = offsets.end();
+
+  for( ; ; )
+  {
+    vector< WordArticleLink > result = readChain( chainPtr );
+
+    for( unsigned i = 0; i < result.size(); i++ )
+    {
+      QList< uint32_t >::Iterator it = qBinaryFind( begOffsets, endOffsets,
+                                                    result.at( i ).articleOffset );
+
+      if( it != offsets.end() )
+      {
+        headwords.append(  QString::fromUtf8( ( result[ i ].prefix + result[ i ].word ).c_str() ) );
+        offsets.erase( it );
+        begOffsets = offsets.begin();
+        endOffsets = offsets.end();
+      }
+
+      if( offsets.isEmpty() )
+        break;
+    }
+
+    if( offsets.isEmpty() )
+      break;
+
+    if ( chainPtr >= leafEnd )
+    {
+      // We're past the current leaf, fetch the next one
+
+      if ( nextLeaf )
+      {
+        readNode( nextLeaf, extLeaf );
+        leaf = &extLeaf.front();
+        leafEnd = leaf + extLeaf.size();
+
+        nextLeaf = idxFile->read< uint32_t >();
+        chainPtr = leaf + sizeof( uint32_t );
+
+        leafEntries = *(uint32_t *)leaf;
+
+        if ( leafEntries == 0xffffFFFF )
+          throw exCorruptedChainData();
+      }
+      else
+        break; // That was the last leaf
+    }
+  }
+}
+
+bool BtreeDictionary::getHeadwords( QStringList &headwords )
+{
+  QSet< QString > setOfHeadwords;
+
+  headwords.clear();
+  setOfHeadwords.reserve( getWordCount() );
+
+  try
+  {
+    getAllHeadwords( setOfHeadwords );
+
+    if( setOfHeadwords.size() )
+    {
+#if QT_VERSION >= 0x040700
+      headwords.reserve( setOfHeadwords.size() );
+#endif
+
+      QSet< QString >::const_iterator it = setOfHeadwords.constBegin();
+      QSet< QString >::const_iterator end = setOfHeadwords.constEnd();
+
+      for( ; it != end; ++it )
+        headwords.append( *it );
+    }
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Failed headwords retrieving for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+
+  return headwords.size() > 0;
+}
+
+void BtreeDictionary::getArticleText(uint32_t, QString &, QString & )
+{
+}
+
 }
diff -Nru goldendict-1.5.0~git20131003/btreeidx.hh goldendict-1.5.0~git20150923/btreeidx.hh
--- goldendict-1.5.0~git20131003/btreeidx.hh	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/btreeidx.hh	2015-09-23 08:26:24.000000000 +0000
@@ -10,6 +10,9 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <QVector>
+#include <QSet>
+#include <QList>
 
 #ifdef _MSC_VER
 #include <stdint_msvc.h>
@@ -83,6 +86,23 @@
   /// is performed.
   vector< WordArticleLink > findArticles( wstring const & );
 
+  /// Find all unique article links in the index
+  void findAllArticleLinks( QVector< WordArticleLink > & articleLinks );
+
+  /// Retrieve all unique headwors from index
+  void getAllHeadwords( QSet< QString > & headwords );
+
+  /// Find all article links and/or headwords in the index
+  void findArticleLinks( QVector< WordArticleLink > * articleLinks,
+                         QSet< uint32_t > * offsets,
+                         QSet< QString > * headwords,
+                         QAtomicInt * isCancelled = 0 );
+
+  /// Retrieve headwords for presented article adresses
+  void getHeadwordsFromOffsets( QList< uint32_t > & offsets,
+                                QVector< QString > & headwords,
+                                QAtomicInt * isCancelled = 0 );
+
 protected:
 
   /// Finds the offset in the btree leaf for the given word, either matching
@@ -129,8 +149,6 @@
                            // since all searches always start with it.
 };
 
-class BtreeWordSearchRequest;
-
 /// A base for the dictionary that utilizes a btree index build using
 /// buildIndex() function declared below.
 class BtreeDictionary: public Dictionary::Class, public BtreeIndex
@@ -143,7 +161,7 @@
   virtual Dictionary::Features getFeatures() const throw()
   { return Dictionary::SuitableForCompoundSearching; }
 
-  /// This function does the search using the btree index. Derivatives
+  /// This function does the search using the btree index. Derivatives usually
   /// need not to implement this function.
   virtual sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &,
                                                              unsigned long )
@@ -158,7 +176,18 @@
   virtual bool isLocalDictionary()
   { return true; }
 
-protected:
+  virtual bool getHeadwords( QStringList &headwords );
+
+  virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  string const & ftsIndexName() const
+  { return ftsIdxName; }
+
+  Mutex & getFtsMutex()
+  { return ftsIdxMutex; }
+
+  virtual uint32_t getFtsIndexVersion()
+  { return 0; }
 
   /// Called before each matching operation to ensure that any child init
   /// has completed. Mainly used for deferred init. The default implementation
@@ -167,7 +196,47 @@
   /// successful, or a human-readable error string otherwise.
   virtual string const & ensureInitDone();
 
+protected:
+  Mutex ftsIdxMutex;
+  string ftsIdxName;
+
   friend class BtreeWordSearchRequest;
+  friend class FTSResultsRequest;
+};
+
+class BtreeWordSearchRequest: public Dictionary::WordSearchRequest
+{
+  friend class BtreeWordSearchRunnable;
+protected:
+  BtreeDictionary & dict;
+  wstring str;
+  unsigned long maxResults;
+  unsigned minLength;
+  int maxSuffixVariation;
+  bool allowMiddleMatches;
+  QAtomicInt isCancelled;
+  QSemaphore hasExited;
+
+public:
+
+  BtreeWordSearchRequest( BtreeDictionary & dict_,
+                          wstring const & str_,
+                          unsigned minLength_,
+                          int maxSuffixVariation_,
+                          bool allowMiddleMatches_,
+                          unsigned long maxResults_,
+                          bool startRunnable = true );
+
+  virtual void findMatches();
+
+  void run(); // Run from another thread by BtreeWordSearchRunnable
+
+  virtual void cancel()
+  {
+    isCancelled.ref();
+  }
+
+  ~BtreeWordSearchRequest();
 };
 
 // Everything below is for building the index data.
diff -Nru goldendict-1.5.0~git20131003/config.cc goldendict-1.5.0~git20150923/config.cc
--- goldendict-1.5.0~git20131003/config.cc	2013-10-02 20:48:41.000000000 +0000
+++ goldendict-1.5.0~git20150923/config.cc	2015-09-23 09:22:38.000000000 +0000
@@ -5,7 +5,7 @@
 #include <QDir>
 #include <QFile>
 #include <QtXml>
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 #ifdef _MSC_VER
 #include <stdint_msvc.h>
@@ -50,7 +50,7 @@
 
 }
 
-ProxyServer::ProxyServer(): enabled( false ), type( Socks5 ), port( 3128 )
+ProxyServer::ProxyServer(): enabled( false ), useSystemProxy( false ), type( Socks5 ), port( 3128 )
 {
 }
 
@@ -122,14 +122,18 @@
   enableWebPlugins( false ),
   hideGoldenDictHeader( false ),
   zoomFactor( 1 ),
+  helpZoomFactor( 1 ),
   wordsZoomLevel( 0 ),
   maxStringsInHistory( 500 ),
   storeHistory( 1 ),
-  alwaysExpandOptionalParts( true )
+  alwaysExpandOptionalParts( false )
 , historyStoreInterval( 0 )
 , collapseBigArticles( false )
 , articleSizeLimit( 2000 )
 , maxDictionaryRefsInContextMenu ( 20 )
+#ifndef Q_WS_X11
+, trackClipboardChanges( false )
+#endif
 {
 }
 
@@ -172,8 +176,8 @@
 
   mw.push_back( MediaWiki( "ae6f89aac7151829681b85f035d54e48", "English Wikipedia", "http://en.wikipedia.org/w", enable, "" ) );
   mw.push_back( MediaWiki( "affcf9678e7bfe701c9b071f97eccba3", "English Wiktionary", "http://en.wiktionary.org/w", false, ""  ) );
-  mw.push_back( MediaWiki( "8e0c1c2b6821dab8bdba8eb869ca7176", "Russian Wikipedia", "http://ru.wikipedia.org/w", false, "" ) );
-  mw.push_back( MediaWiki( "b09947600ae3902654f8ad4567ae8567", "Russian Wiktionary", "http://ru.wiktionary.org/w", false, "" ) );
+  mw.push_back( MediaWiki( "8e0c1c2b6821dab8bdba8eb869ca7176", "Russian Wikipedia", "https://ru.wikipedia.org/w", false, "" ) );
+  mw.push_back( MediaWiki( "b09947600ae3902654f8ad4567ae8567", "Russian Wiktionary", "https://ru.wiktionary.org/w", false, "" ) );
   mw.push_back( MediaWiki( "a8a66331a1242ca2aeb0b4aed361c41d", "German Wikipedia", "http://de.wikipedia.org/w", false, "" ) );
   mw.push_back( MediaWiki( "21c64bca5ec10ba17ff19f3066bc962a", "German Wiktionary", "http://de.wiktionary.org/w", false, "" ) );
   mw.push_back( MediaWiki( "96957cb2ad73a20c7a1d561fc83c253a", "Portuguese Wikipedia", "http://pt.wikipedia.org/w", false, "" ) );
@@ -197,6 +201,13 @@
   return ws;
 }
 
+DictServers makeDefaultDictServers()
+{
+  DictServers ds;
+
+  return ds;
+}
+
 Programs makeDefaultPrograms()
 {
   Programs programs;
@@ -367,6 +378,7 @@
 
     c.mediawikis = makeDefaultMediaWikis( true );
     c.webSites = makeDefaultWebSites();
+    c.dictServers = makeDefaultDictServers();
 
     // Check if we have a template config file. If we do, load it instead
 
@@ -398,7 +410,7 @@
     // Load the config as usual
     if ( !dd.setContent( &configFile, false, &errorStr, &errorLine, &errorColumn  ) )
     {
-      DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
+      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
         throw exMalformedConfigFile();
     }
   }
@@ -413,7 +425,7 @@
 
     if ( !dd.setContent( &bufferedData, false, &errorStr, &errorLine, &errorColumn  ) )
     {
-      DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
+      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
         throw exMalformedConfigFile();
     }
   }
@@ -609,6 +621,35 @@
     c.webSites = makeDefaultWebSites();
   }
 
+  QDomNode dss = root.namedItem( "dictservers" );
+
+  if ( !dss.isNull() )
+  {
+    QDomNodeList nl = dss.toElement().elementsByTagName( "server" );
+
+    for( unsigned x = 0; x < nl.length(); ++x )
+    {
+      QDomElement ds = nl.item( x ).toElement();
+
+      DictServer d;
+
+      d.id = ds.attribute( "id" );
+      d.name = ds.attribute( "name" );
+      d.url = ds.attribute( "url" );
+      d.enabled = ( ds.attribute( "enabled" ) == "1" );
+      d.databases = ds.attribute( "databases" );
+      d.strategies = ds.attribute( "strategies" );
+      d.iconFilename = ds.attribute( "icon" );
+
+      c.dictServers.push_back( d );
+    }
+  }
+  else
+  {
+    // Upgrading
+    c.dictServers = makeDefaultDictServers();
+  }
+
   QDomNode ves = root.namedItem( "voiceEngines" );
 
   if ( !ves.isNull() )
@@ -642,6 +683,7 @@
   if ( !preferences.isNull() )
   {
     c.preferences.interfaceLanguage = preferences.namedItem( "interfaceLanguage" ).toElement().text();
+    c.preferences.helpLanguage = preferences.namedItem( "helpLanguage" ).toElement().text();
     c.preferences.displayStyle = preferences.namedItem( "displayStyle" ).toElement().text();
     c.preferences.newTabsOpenAfterCurrentOne = ( preferences.namedItem( "newTabsOpenAfterCurrentOne" ).toElement().text() == "1" );
     c.preferences.newTabsOpenInBackground = ( preferences.namedItem( "newTabsOpenInBackground" ).toElement().text() == "1" );
@@ -667,6 +709,9 @@
     if ( !preferences.namedItem( "zoomFactor" ).isNull() )
       c.preferences.zoomFactor = preferences.namedItem( "zoomFactor" ).toElement().text().toDouble();
 
+    if ( !preferences.namedItem( "helpZoomFactor" ).isNull() )
+      c.preferences.helpZoomFactor = preferences.namedItem( "helpZoomFactor" ).toElement().text().toDouble();
+
     if ( !preferences.namedItem( "wordsZoomLevel" ).isNull() )
       c.preferences.wordsZoomLevel = preferences.namedItem( "wordsZoomLevel" ).toElement().text().toInt();
 
@@ -713,11 +758,14 @@
     if ( !proxy.isNull() )
     {
       c.preferences.proxyServer.enabled = ( proxy.toElement().attribute( "enabled" ) == "1" );
+      c.preferences.proxyServer.useSystemProxy = ( proxy.toElement().attribute( "useSystemProxy" ) == "1" );
       c.preferences.proxyServer.type = ( ProxyServer::Type ) proxy.namedItem( "type" ).toElement().text().toULong();
       c.preferences.proxyServer.host = proxy.namedItem( "host" ).toElement().text();
       c.preferences.proxyServer.port = proxy.namedItem( "port" ).toElement().text().toULong();
       c.preferences.proxyServer.user = proxy.namedItem( "user" ).toElement().text();
       c.preferences.proxyServer.password = proxy.namedItem( "password" ).toElement().text();
+      c.preferences.proxyServer.systemProxyUser = proxy.namedItem( "systemProxyUser" ).toElement().text();
+      c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text();
     }
 
     if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
@@ -755,6 +803,47 @@
 
     if ( !preferences.namedItem( "maxDictionaryRefsInContextMenu" ).isNull() )
       c.preferences.maxDictionaryRefsInContextMenu = preferences.namedItem( "maxDictionaryRefsInContextMenu" ).toElement().text().toUShort();
+
+#ifndef Q_WS_X11
+    if ( !preferences.namedItem( "trackClipboardChanges" ).isNull() )
+      c.preferences.trackClipboardChanges = ( preferences.namedItem( "trackClipboardChanges" ).toElement().text() == "1" );
+#endif
+
+    QDomNode fts = preferences.namedItem( "fullTextSearch" );
+
+    if ( !fts.isNull() )
+    {
+      if ( !fts.namedItem( "searchMode" ).isNull() )
+        c.preferences.fts.searchMode = fts.namedItem( "searchMode" ).toElement().text().toInt();
+
+      if ( !fts.namedItem( "matchCase" ).isNull() )
+        c.preferences.fts.matchCase = ( fts.namedItem( "matchCase" ).toElement().text() == "1" );
+
+      if ( !fts.namedItem( "maxArticlesPerDictionary" ).isNull() )
+        c.preferences.fts.maxArticlesPerDictionary = fts.namedItem( "maxArticlesPerDictionary" ).toElement().text().toInt();
+
+      if ( !fts.namedItem( "maxDistanceBetweenWords" ).isNull() )
+        c.preferences.fts.maxDistanceBetweenWords = fts.namedItem( "maxDistanceBetweenWords" ).toElement().text().toInt();
+
+      if ( !fts.namedItem( "useMaxArticlesPerDictionary" ).isNull() )
+        c.preferences.fts.useMaxArticlesPerDictionary = ( fts.namedItem( "useMaxArticlesPerDictionary" ).toElement().text() == "1" );
+
+      if ( !fts.namedItem( "useMaxDistanceBetweenWords" ).isNull() )
+        c.preferences.fts.useMaxDistanceBetweenWords = ( fts.namedItem( "useMaxDistanceBetweenWords" ).toElement().text() == "1" );
+
+      if ( !fts.namedItem( "dialogGeometry" ).isNull() )
+        c.preferences.fts.dialogGeometry = QByteArray::fromBase64( fts.namedItem( "dialogGeometry" ).toElement().text().toLatin1() );
+
+      if( !fts.namedItem( "disabledTypes" ).isNull() )
+      c.preferences.fts.disabledTypes = fts.namedItem( "disabledTypes" ).toElement().text();
+
+      if ( !fts.namedItem( "enabled" ).isNull() )
+        c.preferences.fts.enabled = ( fts.namedItem( "enabled" ).toElement().text() == "1" );
+
+      if ( !fts.namedItem( "maxDictionarySize" ).isNull() )
+        c.preferences.fts.maxDictionarySize = fts.namedItem( "maxDictionarySize" ).toElement().text().toUInt();
+    }
+
   }
 
   c.lastMainGroupId = root.namedItem( "lastMainGroupId" ).toElement().text().toUInt();
@@ -782,6 +871,16 @@
   if ( !mainWindowGeometry.isNull() )
     c.mainWindowGeometry = QByteArray::fromBase64( mainWindowGeometry.toElement().text().toLatin1() );
 
+  QDomNode helpWindowGeometry = root.namedItem( "helpWindowGeometry" );
+
+  if ( !helpWindowGeometry.isNull() )
+    c.helpWindowGeometry = QByteArray::fromBase64( helpWindowGeometry.toElement().text().toLatin1() );
+
+  QDomNode helpSplitterState = root.namedItem( "helpSplitterState" );
+
+  if ( !helpSplitterState.isNull() )
+    c.helpSplitterState = QByteArray::fromBase64( helpSplitterState.toElement().text().toLatin1() );
+
 #ifdef Q_OS_WIN
   QDomNode maximizedMainWindowGeometry = root.namedItem( "maximizedMainWindowGeometry" );
 
@@ -798,6 +897,22 @@
       height = maximizedMainWindowGeometry.namedItem( "height" ).toElement().text().toInt();
     c.maximizedMainWindowGeometry = QRect( x, y, width, height );
   }
+
+  QDomNode normalMainWindowGeometry = root.namedItem( "normalMainWindowGeometry" );
+
+  if ( !normalMainWindowGeometry.isNull() )
+  {
+    int x = 0, y = 0, width = 0, height = 0;
+    if( !normalMainWindowGeometry.namedItem( "x" ).isNull() )
+      x = normalMainWindowGeometry.namedItem( "x" ).toElement().text().toInt();
+    if( !normalMainWindowGeometry.namedItem( "y" ).isNull() )
+      y = normalMainWindowGeometry.namedItem( "y" ).toElement().text().toInt();
+    if( !normalMainWindowGeometry.namedItem( "width" ).isNull() )
+      width = normalMainWindowGeometry.namedItem( "width" ).toElement().text().toInt();
+    if( !normalMainWindowGeometry.namedItem( "height" ).isNull() )
+      height = normalMainWindowGeometry.namedItem( "height" ).toElement().text().toInt();
+    c.normalMainWindowGeometry = QRect( x, y, width, height );
+  }
 #endif
 
   QDomNode dictInfoGeometry = root.namedItem( "dictInfoGeometry" );
@@ -846,6 +961,26 @@
     }
   }
 
+  QDomNode headwordsDialog = root.namedItem( "headwordsDialog" );
+
+  if ( !headwordsDialog.isNull() )
+  {
+    if ( !headwordsDialog.namedItem( "searchMode" ).isNull() )
+      c.headwordsDialog.searchMode = headwordsDialog.namedItem( "searchMode" ).toElement().text().toInt();
+
+    if ( !headwordsDialog.namedItem( "matchCase" ).isNull() )
+      c.headwordsDialog.matchCase = ( headwordsDialog.namedItem( "matchCase" ).toElement().text() == "1" );
+
+    if ( !headwordsDialog.namedItem( "autoApply" ).isNull() )
+      c.headwordsDialog.autoApply = ( headwordsDialog.namedItem( "autoApply" ).toElement().text() == "1" );
+
+    if ( !headwordsDialog.namedItem( "headwordsExportPath" ).isNull() )
+      c.headwordsDialog.headwordsExportPath = headwordsDialog.namedItem( "headwordsExportPath" ).toElement().text();
+
+    if ( !headwordsDialog.namedItem( "headwordsDialogGeometry" ).isNull() )
+      c.headwordsDialog.headwordsDialogGeometry = QByteArray::fromBase64( headwordsDialog.namedItem( "headwordsDialogGeometry" ).toElement().text().toLatin1() );
+  }
+
   return c;
 }
 
@@ -1176,6 +1311,45 @@
   }
 
   {
+    QDomElement dss = dd.createElement( "dictservers" );
+    root.appendChild( dss );
+
+    for( DictServers::const_iterator i = c.dictServers.begin(); i != c.dictServers.end(); ++i )
+    {
+      QDomElement ds = dd.createElement( "server" );
+      dss.appendChild( ds );
+
+      QDomAttr id = dd.createAttribute( "id" );
+      id.setValue( i->id );
+      ds.setAttributeNode( id );
+
+      QDomAttr name = dd.createAttribute( "name" );
+      name.setValue( i->name );
+      ds.setAttributeNode( name );
+
+      QDomAttr url = dd.createAttribute( "url" );
+      url.setValue( i->url );
+      ds.setAttributeNode( url );
+
+      QDomAttr enabled = dd.createAttribute( "enabled" );
+      enabled.setValue( i->enabled ? "1" : "0" );
+      ds.setAttributeNode( enabled );
+
+      QDomAttr databases = dd.createAttribute( "databases" );
+      databases.setValue( i->databases );
+      ds.setAttributeNode( databases );
+
+      QDomAttr strategies = dd.createAttribute( "strategies" );
+      strategies.setValue( i->strategies );
+      ds.setAttributeNode( strategies );
+
+      QDomAttr icon = dd.createAttribute( "icon" );
+      icon.setValue( i->iconFilename );
+      ds.setAttributeNode( icon );
+    }
+  }
+
+  {
     QDomElement programs = dd.createElement( "programs" );
     root.appendChild( programs );
 
@@ -1265,6 +1439,10 @@
     opt.appendChild( dd.createTextNode( c.preferences.interfaceLanguage ) );
     preferences.appendChild( opt );
 
+    opt = dd.createElement( "helpLanguage" );
+    opt.appendChild( dd.createTextNode( c.preferences.helpLanguage ) );
+    preferences.appendChild( opt );
+
     opt = dd.createElement( "displayStyle" );
     opt.appendChild( dd.createTextNode( c.preferences.displayStyle ) );
     preferences.appendChild( opt );
@@ -1321,6 +1499,10 @@
     opt.appendChild( dd.createTextNode( QString::number( c.preferences.zoomFactor ) ) );
     preferences.appendChild( opt );
 
+    opt = dd.createElement( "helpZoomFactor" );
+    opt.appendChild( dd.createTextNode( QString::number( c.preferences.helpZoomFactor ) ) );
+    preferences.appendChild( opt );
+
     opt = dd.createElement( "wordsZoomLevel" );
     opt.appendChild( dd.createTextNode( QString::number( c.preferences.wordsZoomLevel ) ) );
     preferences.appendChild( opt );
@@ -1421,6 +1603,10 @@
       enabled.setValue( c.preferences.proxyServer.enabled ? "1" : "0" );
       proxy.setAttributeNode( enabled );
 
+      QDomAttr useSystemProxy = dd.createAttribute( "useSystemProxy" );
+      useSystemProxy.setValue( c.preferences.proxyServer.useSystemProxy ? "1" : "0" );
+      proxy.setAttributeNode( useSystemProxy );
+
       opt = dd.createElement( "type" );
       opt.appendChild( dd.createTextNode( QString::number( c.preferences.proxyServer.type ) ) );
       proxy.appendChild( opt );
@@ -1440,6 +1626,14 @@
       opt = dd.createElement( "password" );
       opt.appendChild( dd.createTextNode( c.preferences.proxyServer.password ) );
       proxy.appendChild( opt );
+
+      opt = dd.createElement( "systemProxyUser" );
+      opt.appendChild( dd.createTextNode( c.preferences.proxyServer.systemProxyUser ) );
+      proxy.appendChild( opt );
+
+      opt = dd.createElement( "systemProxyPassword" );
+      opt.appendChild( dd.createTextNode( c.preferences.proxyServer.systemProxyPassword ) );
+      proxy.appendChild( opt );
     }
 
     opt = dd.createElement( "checkForNewReleases" );
@@ -1484,7 +1678,59 @@
 
     opt = dd.createElement( "maxDictionaryRefsInContextMenu" );
     opt.appendChild( dd.createTextNode( QString::number( c.preferences.maxDictionaryRefsInContextMenu ) ) );
-    preferences.appendChild( opt ); }
+    preferences.appendChild( opt );
+
+#ifndef Q_WS_X11
+    opt = dd.createElement( "trackClipboardChanges" );
+    opt.appendChild( dd.createTextNode( c.preferences.trackClipboardChanges ? "1" : "0" ) );
+    preferences.appendChild( opt );
+#endif
+    {
+      QDomNode hd = dd.createElement( "fullTextSearch" );
+      preferences.appendChild( hd );
+
+      QDomElement opt = dd.createElement( "searchMode" );
+      opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.searchMode ) ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "matchCase" );
+      opt.appendChild( dd.createTextNode( c.preferences.fts.matchCase ? "1" : "0" ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "maxArticlesPerDictionary" );
+      opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.maxArticlesPerDictionary ) ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "maxDistanceBetweenWords" );
+      opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.maxDistanceBetweenWords ) ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "useMaxArticlesPerDictionary" );
+      opt.appendChild( dd.createTextNode( c.preferences.fts.useMaxArticlesPerDictionary ? "1" : "0" ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "useMaxDistanceBetweenWords" );
+      opt.appendChild( dd.createTextNode( c.preferences.fts.useMaxDistanceBetweenWords ? "1" : "0" ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "dialogGeometry" );
+      opt.appendChild( dd.createTextNode( QString::fromLatin1( c.preferences.fts.dialogGeometry.toBase64() ) ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "disabledTypes" );
+      opt.appendChild( dd.createTextNode( c.preferences.fts.disabledTypes ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "enabled" );
+      opt.appendChild( dd.createTextNode( c.preferences.fts.enabled ? "1" : "0" ) );
+      hd.appendChild( opt );
+
+      opt = dd.createElement( "maxDictionarySize" );
+      opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.maxDictionarySize ) ) );
+      hd.appendChild( opt );
+    }
+
+  }
 
   {
     QDomElement opt = dd.createElement( "lastMainGroupId" );
@@ -1515,6 +1761,14 @@
     opt.appendChild( dd.createTextNode( QString::fromLatin1( c.mainWindowGeometry.toBase64() ) ) );
     root.appendChild( opt );
 
+    opt = dd.createElement( "helpWindowGeometry" );
+    opt.appendChild( dd.createTextNode( QString::fromLatin1( c.helpWindowGeometry.toBase64() ) ) );
+    root.appendChild( opt );
+
+    opt = dd.createElement( "helpSplitterState" );
+    opt.appendChild( dd.createTextNode( QString::fromLatin1( c.helpSplitterState.toBase64() ) ) );
+    root.appendChild( opt );
+
 #ifdef Q_OS_WIN
     {
       QDomElement maximizedMainWindowGeometry = dd.createElement( "maximizedMainWindowGeometry" );
@@ -1535,6 +1789,25 @@
       opt = dd.createElement( "height" );
       opt.appendChild( dd.createTextNode( QString::number( c.maximizedMainWindowGeometry.height() ) ) );
       maximizedMainWindowGeometry.appendChild( opt );
+
+      QDomElement normalMainWindowGeometry = dd.createElement( "normalMainWindowGeometry" );
+      root.appendChild( normalMainWindowGeometry );
+
+      opt = dd.createElement( "x" );
+      opt.appendChild( dd.createTextNode( QString::number( c.normalMainWindowGeometry.x() ) ) );
+      normalMainWindowGeometry.appendChild( opt );
+
+      opt = dd.createElement( "y" );
+      opt.appendChild( dd.createTextNode( QString::number( c.normalMainWindowGeometry.y() ) ) );
+      normalMainWindowGeometry.appendChild( opt );
+
+      opt = dd.createElement( "width" );
+      opt.appendChild( dd.createTextNode( QString::number( c.normalMainWindowGeometry.width() ) ) );
+      normalMainWindowGeometry.appendChild( opt );
+
+      opt = dd.createElement( "height" );
+      opt.appendChild( dd.createTextNode( QString::number( c.normalMainWindowGeometry.height() ) ) );
+      normalMainWindowGeometry.appendChild( opt );
     }
 #endif
 
@@ -1596,6 +1869,31 @@
     root.appendChild( opt );
   }
 
+  {
+    QDomNode hd = dd.createElement( "headwordsDialog" );
+    root.appendChild( hd );
+
+    QDomElement opt = dd.createElement( "searchMode" );
+    opt.appendChild( dd.createTextNode( QString::number( c.headwordsDialog.searchMode ) ) );
+    hd.appendChild( opt );
+
+    opt = dd.createElement( "matchCase" );
+    opt.appendChild( dd.createTextNode( c.headwordsDialog.matchCase ? "1" : "0" ) );
+    hd.appendChild( opt );
+
+    opt = dd.createElement( "autoApply" );
+    opt.appendChild( dd.createTextNode( c.headwordsDialog.autoApply ? "1" : "0" ) );
+    hd.appendChild( opt );
+
+    opt = dd.createElement( "headwordsExportPath" );
+    opt.appendChild( dd.createTextNode( c.headwordsDialog.headwordsExportPath ) );
+    hd.appendChild( opt );
+
+    opt = dd.createElement( "headwordsDialogGeometry" );
+    opt.appendChild( dd.createTextNode( QString::fromLatin1( c.headwordsDialog.headwordsDialogGeometry.toBase64() ) ) );
+    hd.appendChild( opt );
+  }
+
   QByteArray result( dd.toByteArray() );
 
   if ( configFile.write( result ) != result.size() )
@@ -1673,6 +1971,14 @@
     return QCoreApplication::applicationDirPath() + "/locale";
 }
 
+QString getHelpDir() throw()
+{
+  if ( QDir( getProgramDataDir() ).cd( "help" ) )
+    return getProgramDataDir() + "/help";
+  else
+    return QCoreApplication::applicationDirPath() + "/help";
+}
+
 bool isPortableVersion() throw()
 {
   struct IsPortable
diff -Nru goldendict-1.5.0~git20131003/config.hh goldendict-1.5.0~git20150923/config.hh
--- goldendict-1.5.0~git20131003/config.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/config.hh	2015-09-23 08:26:24.000000000 +0000
@@ -116,6 +116,7 @@
 struct ProxyServer
 {
   bool enabled;
+  bool useSystemProxy;
 
   enum Type
   {
@@ -127,6 +128,7 @@
   QString host;
   unsigned port;
   QString user, password;
+  QString systemProxyUser, systemProxyPassword;
 
   ProxyServer();
 };
@@ -146,10 +148,35 @@
   QKeySequence toKeySequence() const;
 };
 
+struct FullTextSearch
+{
+  int searchMode;
+  bool matchCase;
+  int maxArticlesPerDictionary;
+  int maxDistanceBetweenWords;
+  bool useMaxDistanceBetweenWords;
+  bool useMaxArticlesPerDictionary;
+  bool enabled;
+  quint32 maxDictionarySize;
+  QByteArray dialogGeometry;
+  QString disabledTypes;
+
+  FullTextSearch() :
+    searchMode( 0 ), matchCase( false ),
+    maxArticlesPerDictionary( 100 ),
+    maxDistanceBetweenWords( 2 ),
+    useMaxDistanceBetweenWords( true ),
+    useMaxArticlesPerDictionary( false ),
+    enabled( true ),
+    maxDictionarySize( 0 )
+  {}
+};
+
 /// Various user preferences
 struct Preferences
 {
   QString interfaceLanguage; // Empty value corresponds to system default
+  QString helpLanguage; // Empty value corresponds to interface language
   QString displayStyle; // Empty value corresponds to the default one
   bool newTabsOpenAfterCurrentOne;
   bool newTabsOpenInBackground;
@@ -199,6 +226,7 @@
   bool hideGoldenDictHeader;
 
   qreal zoomFactor;
+  qreal helpZoomFactor;
   int wordsZoomLevel;
 
   unsigned maxStringsInHistory;
@@ -211,9 +239,14 @@
   int articleSizeLimit;
 
   unsigned short maxDictionaryRefsInContextMenu;
+#ifndef Q_WS_X11
+  bool trackClipboardChanges;
+#endif
 
   QString addonStyle;
 
+  FullTextSearch fts;
+
   Preferences();
 };
 
@@ -258,6 +291,34 @@
 /// All the WebSites
 typedef QVector< WebSite > WebSites;
 
+/// Any DICT server
+struct DictServer
+{
+  QString id, name, url;
+  bool enabled;
+  QString databases;
+  QString strategies;
+  QString iconFilename;
+
+  DictServer(): enabled( false )
+  {}
+
+  DictServer( QString const & id_, QString const & name_, QString const & url_,
+              bool enabled_, QString const & databases_, QString const & strategies_,
+              QString const & iconFilename_ ):
+    id( id_ ), name( name_ ), url( url_ ), enabled( enabled_ ), databases( databases_ ),
+    strategies( strategies_ ), iconFilename( iconFilename_ )  {}
+
+  bool operator == ( DictServer const & other ) const
+  { return id == other.id && name == other.name && url == other.url
+           && enabled == other.enabled && databases == other.databases
+           && strategies == other.strategies
+           && iconFilename == other.iconFilename; }
+};
+
+/// All the DictServers
+typedef QVector< DictServer > DictServers;
+
 /// Hunspell configuration
 struct Hunspell
 {
@@ -423,6 +484,20 @@
 
 typedef QVector< VoiceEngine> VoiceEngines;
 
+struct HeadwordsDialog
+{
+  int searchMode;
+  bool matchCase;
+  bool autoApply;
+  QString headwordsExportPath;
+  QByteArray headwordsDialogGeometry;
+
+  HeadwordsDialog() :
+    searchMode( 0 ), matchCase( false )
+    , autoApply( false )
+  {}
+};
+
 struct Class
 {
   Paths paths;
@@ -433,6 +508,7 @@
   Preferences preferences;
   MediaWikis mediawikis;
   WebSites webSites;
+  DictServers dictServers;
   Hunspell hunspell;
   Transliteration transliteration;
   Forvo forvo;
@@ -446,6 +522,8 @@
   QByteArray popupWindowGeometry; // Geometry saved by QMainWindow
   QByteArray dictInfoGeometry; // Geometry of "Dictionary info" window
   QByteArray inspectorGeometry; // Geometry of WebKit inspector window
+  QByteArray helpWindowGeometry; // Geometry of help window
+  QByteArray helpSplitterState; // Geometry of help splitter
 
   QString historyExportPath; // Path for export/import history
   QString resourceSavePath;  // Path to save images/audio
@@ -473,8 +551,11 @@
   /// Bigger headwords won't be indexed. For now, only in DSL.
   unsigned int maxHeadwordSize;
 
+  HeadwordsDialog headwordsDialog;
+
 #ifdef Q_OS_WIN
   QRect maximizedMainWindowGeometry;
+  QRect normalMainWindowGeometry;
 #endif
 
   QString editDictionaryCommandLine; // Command line to call external editor for dictionary
@@ -561,6 +642,9 @@
 /// Returns the directory storing program localizized files (.qm).
 QString getLocDir() throw();
 
+/// Returns the directory storing program help files (.qch).
+QString getHelpDir() throw();
+
 /// Returns true if the program is configured as a portable version. In that
 /// mode, all the settings and indices are kept in the program's directory.
 bool isPortableVersion() throw();
diff -Nru goldendict-1.5.0~git20131003/CREDITS.txt goldendict-1.5.0~git20150923/CREDITS.txt
--- goldendict-1.5.0~git20131003/CREDITS.txt	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/CREDITS.txt	2015-09-23 08:26:24.000000000 +0000
@@ -2,15 +2,15 @@
 Jennie Petoumenou <epetoumenou\gmail.com>: Greek transliteration and Greek translation
 Mindaugas Baranauskas <embar\super.lt>: Lithuanian translation
 Vit Pelcak <vit\pelcak.org>: Czech translation
-Hero Phương <herophuong93\gmail.com>: Vietnamese translation
+Hero Phương <herophuong93\gmail.com> , Trần Đình Anh Tuấn <tuantda.vn\gmail.com>: Vietnamese translation
 Daniele Di Pisa <daniele\systems.it>: Italian translation
 Daniel Kaneider: German translation
 Zhang Jinsong <zhangsong023\gmail.com>: Simplified Chinese translation
-Usama Akkad <uahello\gmail.com>: Arabic translation
+Usama Akkad <uahello\gmail.com>, Linux Arab Community Team <linuxac.org>: Arabic translation
 Korostil Daniel <ted.korostiled\gmail.com>: Ukrainian translation
 Grzegorz Karpowicz <greg.karpowicz\gmail.com>: Polish translation
 Nardog <alphisation\gmail.com>: Japanese translation
-Maha 吳寶原, Ray Chou 周邦信, Marcus Bingenheimer: Traditional Chinese translation
+Maha 吳寶原, Ray Chou 周邦信, Marcus Bingenheimer, 黃文龍 <wlhunag\gmail.com>: Traditional Chinese translation
 Besmir Godole <bgodole\gmail.com>: Albanian translation
 Leonardo Montenegro <thesolidone\gmail.com>, MCHAL <MCHAL@anomail.de>, Alexandro Casanova <shorterfire\gmail.com>: Brazilian Portuguese translation
 Julian Depetris Chauvin <jdepetris\gmail.com>: Interface enhancements
@@ -28,3 +28,5 @@
 Cris van Minnen: Dutch translation
 Timon Wong <timon86.wang\gmail.com>: MDict (*.mdx/*.mdd) dictionary format
 PICTT Turkmenistan: Turkmen translation
+Nasrollah Noori <nanopqr@gmail.com>: Persian translation
+Vladimir Gerovski: Macedonian Translation
diff -Nru goldendict-1.5.0~git20131003/debian/changelog goldendict-1.5.0~git20150923/debian/changelog
--- goldendict-1.5.0~git20131003/debian/changelog	2015-08-10 19:41:16.000000000 +0000
+++ goldendict-1.5.0~git20150923/debian/changelog	2015-09-23 08:54:24.000000000 +0000
@@ -1,26 +1,9 @@
-goldendict (1.5.0~git20131003-1build4) wily; urgency=medium
+goldendict (1.5.0~git20150923-1) unstable; urgency=medium
 
-  * No-change rebuild against libhunspell-1.3-0v5
+  * New snapshot.
+   - Updated Homepage (debian/control), closes: #786649.
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 10 Aug 2015 19:41:16 +0000
-
-goldendict (1.5.0~git20131003-1build3) utopic; urgency=medium
-
-  * Rebuild against libav11.
-
- -- Colin Watson <cjwatson@ubuntu.com>  Thu, 04 Sep 2014 21:01:45 +0100
-
-goldendict (1.5.0~git20131003-1build2) utopic; urgency=medium
-
-  * No-change rebuild against libav10.
-
- -- Logan Rosen <logan@ubuntu.com>  Sat, 31 May 2014 22:10:48 -0400
-
-goldendict (1.5.0~git20131003-1build1) trusty; urgency=low
-
-  * No change rebuild against libav 9.
-
- -- Dmitrijs Ledkovs <xnox@ubuntu.com>  Sat, 09 Nov 2013 20:37:54 +0000
+ -- Dmitry E. Oboukhov <unera@debian.org>  Wed, 23 Sep 2015 10:27:23 +0200
 
 goldendict (1.5.0~git20131003-1) unstable; urgency=low
 
diff -Nru goldendict-1.5.0~git20131003/debian/control goldendict-1.5.0~git20150923/debian/control
--- goldendict-1.5.0~git20131003/debian/control	2013-11-09 20:37:54.000000000 +0000
+++ goldendict-1.5.0~git20150923/debian/control	2015-09-23 09:25:35.000000000 +0000
@@ -1,10 +1,11 @@
 Source: goldendict
 Priority: optional
 Section: utils
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Dmitry E. Oboukhov <unera@debian.org>
-Standards-Version: 3.9.3
+Maintainer: Dmitry E. Oboukhov <unera@debian.org>
+Standards-Version: 3.9.6
 Build-Depends: cdbs, debhelper (>= 7),
+ libeb16-dev,
+ libtiff5-dev,
  libao-dev,
  libavformat-dev,
  libavutil-dev,
@@ -22,7 +23,7 @@
  qt4-qmake,
  x11proto-record-dev,
  zlib1g-dev
-Homepage: http://goldendict.berlios.de/
+Homepage: http://goldendict.org
 VCS-Browser: http://git.debian.org/?p=collab-maint/goldendict.git;a=summary
 VCS-Git: git://git.debian.org/collab-maint/goldendict.git
 
diff -Nru goldendict-1.5.0~git20131003/debian/watch goldendict-1.5.0~git20150923/debian/watch
--- goldendict-1.5.0~git20131003/debian/watch	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/debian/watch	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-version=3
-opts=dversionmangle=s/\+deb\d+$// \
-http://goldendict.berlios.de/download.php \
-	http://prdownload.berlios.de/goldendict/goldendict-(\d+(?:\.\d+)+)-src.*?.tar.bz2
diff -Nru goldendict-1.5.0~git20131003/decompress.cc goldendict-1.5.0~git20150923/decompress.cc
--- goldendict-1.5.0~git20131003/decompress.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/decompress.cc	2015-09-23 08:26:24.000000000 +0000
@@ -82,7 +82,8 @@
 
 #define BUFSIZE 0xFFFF
 
-string decompressLzma2( const char * bufptr, unsigned length )
+string decompressLzma2( const char * bufptr, unsigned length,
+                        bool raw_decoder )
 {
 string str;
 lzma_ret res;
@@ -92,9 +93,25 @@
   strm.next_in = reinterpret_cast< const uint8_t * >( bufptr );
   strm.avail_in = length;
 
+  lzma_options_lzma opt;
+  lzma_filter filters[ 2 ];
+
+  if( raw_decoder )
+  {
+    lzma_lzma_preset(&opt, LZMA_PRESET_DEFAULT);
+
+    filters[ 0 ].id = LZMA_FILTER_LZMA2;
+    filters[ 0 ].options = &opt;
+    filters[ 1 ].id = LZMA_VLI_UNKNOWN;
+  }
+
   while( 1 )
   {
-    res = lzma_stream_decoder( &strm, UINT64_MAX, 0 );
+    if( raw_decoder )
+      res = lzma_raw_decoder( &strm, filters );
+    else
+      res = lzma_stream_decoder( &strm, UINT64_MAX, 0 );
+
     if( res != LZMA_OK )
       break;
 
diff -Nru goldendict-1.5.0~git20131003/decompress.hh goldendict-1.5.0~git20150923/decompress.hh
--- goldendict-1.5.0~git20131003/decompress.hh	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/decompress.hh	2015-09-23 08:26:24.000000000 +0000
@@ -14,7 +14,8 @@
 
 #ifdef MAKE_ZIM_SUPPORT
 
-string decompressLzma2( const char * bufptr, unsigned length );
+string decompressLzma2( const char * bufptr, unsigned length,
+                        bool raw_decoder = false );
 
 #endif
 
diff -Nru goldendict-1.5.0~git20131003/dictdfiles.cc goldendict-1.5.0~git20150923/dictdfiles.cc
--- goldendict-1.5.0~git20131003/dictdfiles.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictdfiles.cc	2015-09-23 08:26:24.000000000 +0000
@@ -16,7 +16,8 @@
 #include <list>
 #include <wctype.h>
 #include <stdlib.h>
-#include "dprintf.hh"
+#include "gddebug.hh"
+#include "ftshelpers.hh"
 
 #include <QDebug>
 
@@ -45,6 +46,7 @@
 DEF_EX( exFailedToReadLineFromIndex, "Failed to read line from index file", Dictionary::Ex )
 DEF_EX( exMalformedIndexFileLine, "Malformed index file line encountered", Dictionary::Ex )
 DEF_EX( exInvalidBase64, "Invalid base64 sequence encountered", Dictionary::Ex )
+DEF_EX_STR( exDictzipError, "DICTZIP error", Dictionary::Ex )
 
 enum
 {
@@ -86,6 +88,7 @@
   IdxHeader idxHeader;
   dictData * dz;
   string dictionaryName;
+  Mutex indexFileMutex, dzMutex;
 
 public:
 
@@ -118,6 +121,23 @@
                                                       vector< wstring > const & alts,
                                                       wstring const & )
     throw( std::exception );
+
+  virtual QString const& getDescription();
+
+  virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                            int searchMode, bool matchCase,
+                                                            int distanceBetweenWords,
+                                                            int maxResults );
+  void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+  virtual void setFTSParameters( Config::FullTextSearch const & fts )
+  {
+    can_FTS = fts.enabled
+              && !fts.disabledTypes.contains( "DICTD", Qt::CaseInsensitive )
+              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
 };
 
 DictdDictionary::DictdDictionary( string const & id,
@@ -138,16 +158,28 @@
 
   // Open the .dict file
 
-  dz = dict_data_open( dictionaryFiles[ 1 ].c_str(), 0 );
+  DZ_ERRORS error;
+  dz = dict_data_open( dictionaryFiles[ 1 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exCantReadFile( dictionaryFiles[ 1 ] );
+    throw exDictzipError( string( dz_error_str( error ) )
+                          + "(" + getDictionaryFilenames()[ 1 ] + ")" );
 
   // Initialize the index
 
   openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
                         idxHeader.indexRootOffset ),
              idx, idxMutex );
+
+  // Full-text search parameters
+
+  can_FTS = true;
+
+  ftsIdxName = indexFile + "_FTS";
+
+  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+    FTS_index_completed.ref();
 }
 
 DictdDictionary::~DictdDictionary()
@@ -248,10 +280,13 @@
 
       // Now load that article
 
-      indexFile.seek( chain[ x ].articleOffset );
+      {
+        Mutex::Lock _( indexFileMutex );
+        indexFile.seek( chain[ x ].articleOffset );
 
-      if ( !indexFile.gets( buf, sizeof( buf ), true ) )
-        throw exFailedToReadLineFromIndex();
+        if ( !indexFile.gets( buf, sizeof( buf ), true ) )
+          throw exFailedToReadLineFromIndex();
+      }
 
       char * tab1 = strchr( buf, '\t' );
 
@@ -281,7 +316,11 @@
 
       string articleText;
 
-      char * articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
+      char * articleBody;
+      {
+        Mutex::Lock _( dzMutex );
+        articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
+      }
 
       if ( !articleBody )
       {
@@ -355,6 +394,134 @@
   }
 }
 
+QString const& DictdDictionary::getDescription()
+{
+    if( !dictionaryDescription.isEmpty() )
+        return dictionaryDescription;
+
+    sptr< Dictionary::DataRequest > req = getArticle( GD_NATIVE_TO_WS( L"00databaseinfo" ),
+                                                      vector< wstring >(), wstring() );
+
+    if( req->dataSize() > 0 )
+      dictionaryDescription = Html::unescape( QString::fromUtf8( req->getFullData().data(), req->getFullData().size() ), true );
+    else
+      dictionaryDescription = "NONE";
+
+    return dictionaryDescription;
+}
+
+void DictdDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "DictD: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "DictD: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void DictdDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    char buf[ 16384 ];
+    {
+      Mutex::Lock _( indexFileMutex );
+      indexFile.seek( articleAddress );
+
+      if ( !indexFile.gets( buf, sizeof( buf ), true ) )
+        throw exFailedToReadLineFromIndex();
+    }
+
+    char * tab1 = strchr( buf, '\t' );
+
+    if ( !tab1 )
+      throw exMalformedIndexFileLine();
+
+    headword = QString::fromUtf8( buf, tab1 - buf );
+
+    char * tab2 = strchr( tab1 + 1, '\t' );
+
+    if ( !tab2 )
+      throw exMalformedIndexFileLine();
+
+    // After tab1 should be article offset, after tab2 -- article size
+
+    uint32_t articleOffset = decodeBase64( string( tab1 + 1, tab2 - tab1 - 1 ) );
+
+    char * tab3 = strchr( tab2 + 1, '\t');
+
+    uint32_t articleSize;
+    if ( tab3 )
+    {
+      articleSize = decodeBase64( string( tab2 + 1, tab3 - tab2 - 1 ) );
+    }
+    else
+    {
+      articleSize = decodeBase64( tab2 + 1 );
+    }
+
+    string articleText;
+
+    char * articleBody;
+    {
+      Mutex::Lock _( dzMutex );
+      articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
+    }
+
+    if ( !articleBody )
+    {
+      articleText = dict_error_str( dz );
+    }
+    else
+    {
+      static QRegExp phonetic( "\\\\([^\\\\]+)\\\\", Qt::CaseInsensitive ); // phonetics: \stuff\ ...
+      static QRegExp refs( "\\{([^\\{\\}]+)\\}", Qt::CaseInsensitive );     // links: {stuff}
+
+      string convertedText = Html::preformat( articleBody, isToLanguageRTL() );
+      free( articleBody );
+
+      text = QString::fromUtf8( convertedText.data(), convertedText.size() )
+            .replace(phonetic, "<span class=\"dictd_phonetic\">\\1</span>")
+            .replace(refs, "<a href=\"gdlookup://localhost/\\1\">\\1</a>");
+
+      text = Html::unescape( text );
+    }
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "DictD: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+sptr< Dictionary::DataRequest > DictdDictionary::getSearchResults( QString const & searchString,
+                                                                   int searchMode, bool matchCase,
+                                                                   int distanceBetweenWords,
+                                                                   int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 } // anonymous namespace
 
 vector< sptr< Dictionary::Class > > makeDictionaries(
@@ -400,7 +567,7 @@
         // Building the index
         string dictionaryName = nameFromFileName( dictFiles[ 0 ] );
 
-        qDebug( "DictD: Building the index for dictionary: %s\n", dictionaryName.c_str() );
+        gdDebug( "DictD: Building the index for dictionary: %s\n", dictionaryName.c_str() );
 
         initializing.indexingDictionary( dictionaryName );
 
@@ -443,7 +610,7 @@
                 char * tab4 = strchr( tab3 + 1, '\t');
                 if ( tab4 )
                 {
-                  DPRINTF( "Warning: too many tabs present, skipping: %s\n", buf );
+                  GD_DPRINTF( "Warning: too many tabs present, skipping: %s\n", buf );
                   continue;
                 }
 
@@ -463,7 +630,9 @@
                 // After tab1 should be article offset, after tab2 -- article size
                 uint32_t articleOffset = decodeBase64( string( tab1 + 1, tab2 - tab1 - 1 ) );
                 uint32_t articleSize = decodeBase64( tab2 + 1 );
-                dictData * dz = dict_data_open( dictFiles[ 1 ].c_str(), 0 );
+
+                DZ_ERRORS error;
+                dictData * dz = dict_data_open( dictFiles[ 1 ].c_str(), &error, 0 );
 
                 if ( dz )
                 {
@@ -480,23 +649,26 @@
                       if ( endEol )
                         *endEol = 0;
 
-                      DPRINTF( "DICT NAME: '%s'\n", eol );
+                      GD_DPRINTF( "DICT NAME: '%s'\n", eol );
                       dictionaryName = eol;
                     }
                   }
                   dict_data_close( dz );
                 }
+                else
+                  throw exDictzipError( string( dz_error_str( error ) )
+                                        + "(" + dictFiles[ 1 ] + ")" );
               }
             }
             else
             {
-              DPRINTF( "Warning: only a single tab present, skipping: %s\n", buf );
+              GD_DPRINTF( "Warning: only a single tab present, skipping: %s\n", buf );
               continue;
             }
           }
           else
           {
-            DPRINTF( "Warning: no tabs present, skipping: %s\n", buf );
+            GD_DPRINTF( "Warning: no tabs present, skipping: %s\n", buf );
             continue;
           }
 
@@ -546,8 +718,8 @@
     }
     catch( std::exception & e )
     {
-      qWarning( "Dictd dictionary \"%s\" reading failed, error: %s\n",
-                i->c_str(), e.what() );
+      gdWarning( "Dictd dictionary \"%s\" reading failed, error: %s\n",
+                 i->c_str(), e.what() );
     }
   }
 
diff -Nru goldendict-1.5.0~git20131003/dictheadwords.cc goldendict-1.5.0~git20150923/dictheadwords.cc
--- goldendict-1.5.0~git20131003/dictheadwords.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictheadwords.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,342 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "dictheadwords.hh"
+#include "gddebug.hh"
+#include "mainwindow.hh"
+
+#include <QRegExp>
+#include <QDir>
+#include <QFileDialog>
+#include <QTimer>
+#include <QProgressDialog>
+
+#define AUTO_APPLY_LIMIT 150000
+
+DictHeadwords::DictHeadwords( QWidget *parent, Config::Class & cfg_,
+                              Dictionary::Class * dict_ ) :
+  QDialog(parent)
+, cfg( cfg_ )
+, dict( dict_ )
+, helpAction( this )
+{
+  ui.setupUi( this );
+
+  if( cfg.headwordsDialog.headwordsDialogGeometry.size() > 0 )
+    restoreGeometry( cfg.headwordsDialog.headwordsDialogGeometry );
+
+  bool fromMainWindow = parent->objectName() == "MainWindow";
+
+  if( fromMainWindow )
+    setAttribute( Qt::WA_DeleteOnClose, false );
+
+  setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint );
+
+  ui.searchModeCombo->addItem( tr( "Text" ), QRegExp::FixedString );
+  ui.searchModeCombo->addItem( tr( "Wildcards" ), QRegExp::WildcardUnix );
+  ui.searchModeCombo->addItem( tr( "RegExp" ), QRegExp::RegExp );
+  ui.searchModeCombo->setCurrentIndex( cfg.headwordsDialog.searchMode );
+
+  ui.exportButton->setAutoDefault( false );
+  ui.OKButton->setAutoDefault( false);
+  ui.applyButton->setAutoDefault( true );
+  ui.applyButton->setDefault( true );
+
+  ui.matchCase->setChecked( cfg.headwordsDialog.matchCase );
+
+  model = new QStringListModel( this );
+  model->setStringList( headers );
+
+  proxy = new QSortFilterProxyModel( this );
+
+  proxy->setSourceModel( model );
+
+  proxy->setSortCaseSensitivity( Qt::CaseInsensitive );
+  proxy->setSortLocaleAware( true );
+  proxy->setDynamicSortFilter( false );
+
+  ui.headersListView->setModel( proxy );
+  ui.headersListView->setEditTriggers( QAbstractItemView::NoEditTriggers );
+
+  // very important call, for performance reasons:
+  ui.headersListView->setUniformItemSizes( true );
+
+  delegate = new WordListItemDelegate( ui.headersListView->itemDelegate() );
+  if( delegate )
+    ui.headersListView->setItemDelegate( delegate );
+
+  ui.autoApply->setChecked( cfg.headwordsDialog.autoApply );
+
+  connect( this, SIGNAL( finished( int ) ), this, SLOT( savePos() ) );
+
+  if( !fromMainWindow )
+  {
+    ui.helpButton->hide();
+    connect( this, SIGNAL( closeDialog() ), this, SLOT( accept() ) );
+  }
+  else
+  {
+    connect( ui.helpButton, SIGNAL( clicked() ),
+             this, SLOT( helpRequested() ) );
+
+    helpAction.setShortcut( QKeySequence( "F1" ) );
+    helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
+
+    connect( &helpAction, SIGNAL( triggered() ),
+             this, SLOT( helpRequested() ) );
+
+    addAction( &helpAction );
+  }
+
+  connect( ui.OKButton, SIGNAL( clicked( bool ) ), this, SLOT( okButtonClicked() ) );
+  connect( ui.exportButton, SIGNAL( clicked( bool ) ), this, SLOT( exportButtonClicked() ) );
+  connect( ui.applyButton, SIGNAL( clicked( bool ) ), this, SLOT( filterChanged() ) );
+
+  connect( ui.autoApply, SIGNAL( stateChanged( int ) ),
+           this, SLOT( autoApplyStateChanged( int ) ) );
+
+  connect( ui.filterLine, SIGNAL( textChanged( QString ) ),
+           this, SLOT( filterChangedInternal() ) );
+  connect( ui.searchModeCombo, SIGNAL( currentIndexChanged( int ) ),
+           this, SLOT( filterChangedInternal() ) );
+  connect( ui.matchCase, SIGNAL( stateChanged( int ) ),
+           this, SLOT( filterChangedInternal() ) );
+
+  connect( ui.headersListView, SIGNAL( clicked( QModelIndex ) ),
+           this, SLOT( itemClicked( QModelIndex ) ) );
+
+  connect( proxy, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
+           this, SLOT( showHeadwordsNumber() ) );
+
+  ui.headersListView->installEventFilter( this );
+
+  setup( dict_ );
+}
+
+DictHeadwords::~DictHeadwords()
+{
+  if( delegate )
+    delete delegate;
+}
+
+void DictHeadwords::setup( Dictionary::Class *dict_ )
+{
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+
+  dict = dict_;
+
+  setWindowTitle( QString::fromUtf8( dict->getName().c_str() ) );
+
+  headers.clear();
+  model->setStringList( headers );
+
+  dict->getHeadwords( headers );
+  model->setStringList( headers );
+
+  proxy->sort( 0 );
+  filterChanged();
+
+  if( headers.size() > AUTO_APPLY_LIMIT )
+  {
+    cfg.headwordsDialog.autoApply = ui.autoApply->isChecked();
+    ui.autoApply->setChecked( false );
+    ui.autoApply->setEnabled( false );
+  }
+  else
+  {
+    ui.autoApply->setEnabled( true );
+    ui.autoApply->setChecked( cfg.headwordsDialog.autoApply );
+  }
+
+  ui.applyButton->setEnabled( !ui.autoApply->isChecked() );
+
+  setWindowIcon( dict->getIcon() );
+
+  dictId = QString( dict->getId().c_str() );
+
+  QApplication::restoreOverrideCursor();
+}
+
+void DictHeadwords::savePos()
+{
+  cfg.headwordsDialog.searchMode = ui.searchModeCombo->currentIndex();
+  cfg.headwordsDialog.matchCase = ui.matchCase->isChecked();
+
+  if( headers.size() <= AUTO_APPLY_LIMIT )
+    cfg.headwordsDialog.autoApply = ui.autoApply->isChecked();
+
+  cfg.headwordsDialog.headwordsDialogGeometry = saveGeometry();
+}
+
+bool DictHeadwords::eventFilter( QObject * obj, QEvent * ev )
+{
+  if( obj == ui.headersListView && ev->type() == QEvent::KeyPress )
+  {
+    QKeyEvent * kev = static_cast< QKeyEvent * >( ev );
+    if( kev->key() == Qt::Key_Return || kev->key() == Qt::Key_Enter )
+    {
+      itemClicked( ui.headersListView->currentIndex() );
+      return true;
+    }
+  }
+  return QDialog::eventFilter( obj, ev );
+}
+
+void DictHeadwords::okButtonClicked()
+{
+  savePos();
+  closeDialog();
+}
+
+void DictHeadwords::reject()
+{
+  savePos();
+  closeDialog();
+}
+
+void DictHeadwords::exportButtonClicked()
+{
+  saveHeadersToFile();
+}
+
+void DictHeadwords::filterChangedInternal()
+{
+  // emit signal in async manner, to avoid UI slowdown
+  if( ui.autoApply->isChecked() )
+    QTimer::singleShot( 100, this, SLOT( filterChanged() ) );
+}
+
+void DictHeadwords::filterChanged()
+{
+  QRegExp::PatternSyntax syntax =
+          QRegExp::PatternSyntax( ui.searchModeCombo->itemData(
+                  ui.searchModeCombo->currentIndex()).toInt() );
+
+  Qt::CaseSensitivity caseSensitivity = ui.matchCase->isChecked() ? Qt::CaseSensitive
+                                                                    : Qt::CaseInsensitive;
+
+  QRegExp regExp( ui.filterLine->text(), caseSensitivity, syntax );
+
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+
+  proxy->setFilterRegExp( regExp );
+  proxy->sort( 0 );
+
+  QApplication::restoreOverrideCursor();
+
+  showHeadwordsNumber();
+}
+
+void DictHeadwords::itemClicked( const QModelIndex & index )
+{
+  QVariant value = proxy->data( index, Qt::DisplayRole );
+  if ( value.canConvert< QString >() )
+  {
+    QString headword = value.toString();
+    emit headwordSelected( headword, dictId );
+  }
+}
+
+void DictHeadwords::autoApplyStateChanged( int state )
+{
+  ui.applyButton->setEnabled( state == Qt::Unchecked );
+}
+
+void DictHeadwords::showHeadwordsNumber()
+{
+  ui.headersNumber->setText( tr( "Unique headwords total: %1, filtered: %2" )
+                             .arg( QString::number( headers.size() ) )
+                             .arg( QString::number( proxy->rowCount() ) ) );
+}
+
+void DictHeadwords::saveHeadersToFile()
+{
+  QString exportPath;
+  if( cfg.headwordsDialog.headwordsExportPath.isEmpty() )
+    exportPath = QDir::homePath();
+  else
+  {
+    exportPath = QDir::fromNativeSeparators( cfg.headwordsDialog.headwordsExportPath );
+    if( !QDir( exportPath ).exists() )
+      exportPath = QDir::homePath();
+  }
+
+  QString fileName = QFileDialog::getSaveFileName( this, tr( "Save headwords to file" ),
+                                                   exportPath,
+                                                   tr( "Text files (*.txt);;All files (*.*)" ) );
+  if( fileName.size() == 0)
+      return;
+
+  cfg.headwordsDialog.headwordsExportPath = QDir::toNativeSeparators(
+                                              QFileInfo( fileName ).absoluteDir().absolutePath() );
+  QFile file( fileName );
+
+  for(;;)
+  {
+    if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
+      break;
+
+    int headwordsNumber = proxy->rowCount();
+
+    // Setup progress dialog
+    int n = headwordsNumber;
+    int step = 1;
+    while( n > 1000 )
+    {
+      step *= 10;
+      n /= 10;
+    }
+
+    QProgressDialog progress( tr( "Export headwords..."), tr( "Cancel" ),
+                              0, n, this );
+    progress.setWindowModality( Qt::WindowModal );
+
+    // Write UTF-8 BOM
+    QByteArray line;
+    line.append( 0xEF ).append( 0xBB ).append( 0xBF );
+    if ( file.write( line ) != line.size() )
+      break;
+
+    // Write headwords
+
+    int i;
+    for( i = 0; i < headwordsNumber; ++i )
+    {
+      if( i % step == 0 )
+        progress.setValue( i / step );
+
+      if( progress.wasCanceled() )
+        break;
+
+      QVariant value = proxy->data( proxy->index( i, 0 ) );
+      if( !value.canConvert< QString >() )
+        continue;
+
+      line = value.toString().toUtf8();
+
+      line.replace( '\n', ' ' );
+      line.replace( '\r', ' ' );
+
+      line += "\n";
+
+      if ( file.write( line ) != line.size() )
+        break;
+    }
+
+    if( i < headwordsNumber && !progress.wasCanceled() )
+      break;
+
+    file.close();
+    return;
+  }
+
+  gdWarning( "Headers export error: %s", file.errorString().toUtf8().data() );
+  file.close();
+}
+
+void DictHeadwords::helpRequested()
+{
+  MainWindow * mainWindow = qobject_cast< MainWindow * >( parentWidget() );
+  if( mainWindow )
+    mainWindow->showGDHelpForID( "Dictionary headwords" );
+}
diff -Nru goldendict-1.5.0~git20131003/dictheadwords.hh goldendict-1.5.0~git20150923/dictheadwords.hh
--- goldendict-1.5.0~git20131003/dictheadwords.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictheadwords.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,62 @@
+#ifndef __DICTHEADWORDS_H_INCLUDED__
+#define __DICTHEADWORDS_H_INCLUDED__
+
+#include <QDialog>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <QStringListModel>
+#include <QSortFilterProxyModel>
+#include <QAction>
+
+#include "config.hh"
+#include "ui_dictheadwords.h"
+#include "dictionary.hh"
+#include "delegate.hh"
+#include "helpwindow.hh"
+
+class DictHeadwords : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit DictHeadwords( QWidget * parent, Config::Class & cfg_,
+                          Dictionary::Class * dict_ );
+  virtual ~DictHeadwords();
+
+  void setup( Dictionary::Class * dict_ );
+
+protected:
+  Config::Class & cfg;
+  Dictionary::Class * dict;
+  QStringList headers;
+  QStringListModel * model;
+  QSortFilterProxyModel * proxy;
+  WordListItemDelegate * delegate;
+  QString dictId;
+
+  QAction helpAction;
+
+  void saveHeadersToFile();
+  bool eventFilter( QObject * obj, QEvent * ev );
+
+private:
+  Ui::DictHeadwords ui;
+private slots:
+  void savePos();
+  void filterChangedInternal();
+  void filterChanged();
+  void exportButtonClicked();
+  void okButtonClicked();
+  void itemClicked( const QModelIndex & index );
+  void autoApplyStateChanged( int state );
+  void showHeadwordsNumber();
+  virtual void reject();
+  void helpRequested();
+
+signals:
+  void headwordSelected( QString const &, QString const & );
+  void closeDialog();
+};
+
+#endif // __DICTHEADWORDS_H_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/dictheadwords.ui goldendict-1.5.0~git20150923/dictheadwords.ui
--- goldendict-1.5.0~git20131003/dictheadwords.ui	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictheadwords.ui	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DictHeadwords</class>
+ <widget class="QDialog" name="DictHeadwords">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>458</width>
+    <height>550</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="3" column="0">
+      <widget class="QListView" name="headersListView"/>
+     </item>
+     <item row="3" column="1">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Search mode</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QComboBox" name="searchModeCombo">
+            <property name="toolTip">
+             <string>This element determines how filter string will be interpreted</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="matchCase">
+            <property name="toolTip">
+             <string>If checked on the symbols case will be take in account when filtering</string>
+            </property>
+            <property name="text">
+             <string>Match case</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="exportButton">
+         <property name="toolTip">
+          <string>Exports headwords to file</string>
+         </property>
+         <property name="text">
+          <string>Export</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="helpButton">
+         <property name="text">
+          <string>Help</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="OKButton">
+         <property name="text">
+          <string>OK</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="2" column="1">
+      <widget class="QPushButton" name="applyButton">
+       <property name="toolTip">
+        <string>Press this button to apply filter to headwords list</string>
+       </property>
+       <property name="text">
+        <string>Apply</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QCheckBox" name="autoApply">
+       <property name="toolTip">
+        <string>If checked any filter changes will we immediately applied to headwords list</string>
+       </property>
+       <property name="text">
+        <string>Auto apply</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Filter:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLineEdit" name="filterLine">
+       <property name="toolTip">
+        <string>Filter string (fixed string, wildcards or regular expression)</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="headersNumber">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -Nru goldendict-1.5.0~git20131003/dictinfo.cc goldendict-1.5.0~git20150923/dictinfo.cc
--- goldendict-1.5.0~git20131003/dictinfo.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictinfo.cc	2015-09-23 08:26:24.000000000 +0000
@@ -28,6 +28,11 @@
   ui.editDictionary->setToolTip(
         tr( "Edit the dictionary via command:\n%1" ).arg( cfg.editDictionaryCommandLine ) );
 
+  if( dict->getWordCount() == 0 )
+    ui.headwordsButton->setVisible( false );
+  else
+    ui.buttonsLayout->insertSpacerItem( 0, new QSpacerItem( 40, 20, QSizePolicy::Expanding ) );
+
   std::vector< std::string > const & filenames = dict->getDictionaryFilenames();
 
   QString filenamesText;
@@ -46,6 +51,8 @@
     ui.infoLabel->setPlainText( info );
   else
     ui.infoLabel->clear();
+
+  setWindowIcon( dict->getIcon() );
 }
 
 void DictInfo::savePos( int )
@@ -62,3 +69,13 @@
 {
   done( OPEN_FOLDER );
 }
+
+void DictInfo::on_OKButton_clicked()
+{
+  done( ACCEPTED );
+}
+
+void DictInfo::on_headwordsButton_clicked()
+{
+  done( SHOW_HEADWORDS );
+}
diff -Nru goldendict-1.5.0~git20131003/dictinfo.hh goldendict-1.5.0~git20150923/dictinfo.hh
--- goldendict-1.5.0~git20131003/dictinfo.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictinfo.hh	2015-09-23 08:26:24.000000000 +0000
@@ -16,7 +16,8 @@
     REJECTED,
     ACCEPTED,
     OPEN_FOLDER,
-    EDIT_DICTIONARY
+    EDIT_DICTIONARY,
+    SHOW_HEADWORDS
   };
 
   DictInfo( Config::Class &cfg_, QWidget * parent = 0 );
@@ -29,6 +30,8 @@
   void savePos( int );
   void on_editDictionary_clicked();
   void on_openFolder_clicked();
+  void on_OKButton_clicked();
+  void on_headwordsButton_clicked();
 };
 
 #endif // DICTINFO_HH
diff -Nru goldendict-1.5.0~git20131003/dictinfo.ui goldendict-1.5.0~git20150923/dictinfo.ui
--- goldendict-1.5.0~git20131003/dictinfo.ui	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictinfo.ui	2015-09-23 08:26:24.000000000 +0000
@@ -256,50 +256,60 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons">
-      <bool>true</bool>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="buttonsLayout">
+     <item>
+      <widget class="QPushButton" name="headwordsButton">
+       <property name="toolTip">
+        <string>Show all unique dictionary headwords</string>
+       </property>
+       <property name="text">
+        <string>Headwords</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="OKButton">
+       <property name="text">
+        <string notr="true">OK</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>DictInfo</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>180</x>
-     <y>379</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>25</x>
-     <y>791</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>DictInfo</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>199</x>
-     <y>378</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>199</x>
-     <y>199</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff -Nru goldendict-1.5.0~git20131003/dictionarybar.cc goldendict-1.5.0~git20150923/dictionarybar.cc
--- goldendict-1.5.0~git20131003/dictionarybar.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictionarybar.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,7 +4,7 @@
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QProcess>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "fsencoding.hh"
 #include <QDebug>
 
@@ -112,6 +112,7 @@
       menu.addAction( QIcon( ":/icons/bookcase.png" ), tr( "Edit this group" ) );
 
   QAction * infoAction = NULL;
+  QAction * headwordsAction = NULL;
   QAction * editDictAction = NULL;
   QAction * openDictFolderAction = NULL;
   QString dictFilename;
@@ -136,6 +137,9 @@
 
       if( pDict->isLocalDictionary() )
       {
+        if( pDict->getWordCount() > 0 )
+          headwordsAction = menu.addAction( tr( "Dictionary headwords" ) );
+
         openDictFolderAction = menu.addAction( tr( "Open dictionary folder" ) );
 
         if( !editDictionaryCommand.isEmpty() )
@@ -189,6 +193,13 @@
     return;
   }
 
+  if( result && result == headwordsAction )
+  {
+    QString id = dictAction->data().toString();
+    emit showDictionaryHeadwords( id );
+    return;
+  }
+
   if( result && result == openDictFolderAction )
   {
     QString id = dictAction->data().toString();
diff -Nru goldendict-1.5.0~git20131003/dictionarybar.hh goldendict-1.5.0~git20150923/dictionarybar.hh
--- goldendict-1.5.0~git20131003/dictionarybar.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictionarybar.hh	2015-09-23 08:26:24.000000000 +0000
@@ -39,6 +39,9 @@
   /// Signal for show dictionary info command from context menu
   void showDictionaryInfo( QString const & id );
 
+  /// Signal for show dictionary headwords command from context menu
+  void showDictionaryHeadwords( QString const & id );
+
   /// Signal for open dictionary folder from context menu
   void openDictionaryFolder( QString const & id );
 
diff -Nru goldendict-1.5.0~git20131003/dictionary.cc goldendict-1.5.0~git20150923/dictionary.cc
--- goldendict-1.5.0~git20131003/dictionary.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictionary.cc	2015-09-23 08:26:24.000000000 +0000
@@ -89,6 +89,17 @@
   return matches;
 }
 
+void WordSearchRequest::addMatch( WordMatch const & match )
+{
+  unsigned n;
+  for( n = 0; n < matches.size(); n++ )
+    if( matches[ n ].word.compare( match.word ) == 0 )
+      break;
+
+  if( n >= matches.size() )
+    matches.push_back( match );
+}
+
 ////////////// DataRequest
 
 long DataRequest::dataSize()
@@ -122,6 +133,7 @@
 
 Class::Class( string const & id_, vector< string > const & dictionaryFiles_ ):
   id( id_ ), dictionaryFiles( dictionaryFiles_ ), dictionaryIconLoaded( false )
+  , can_FTS( false), FTS_index_completed( false )
 {
 }
 
@@ -156,6 +168,11 @@
   return new DataRequestInstant( false );
 }
 
+sptr< DataRequest > Class::getSearchResults(const QString &, int, bool, int, int )
+{
+  return new DataRequestInstant( false );
+}
+
 QString const& Class::getDescription()
 {
     return dictionaryDescription;
@@ -426,6 +443,9 @@
   {
     QFileInfo fileInfo( FsEncoding::decode( i->c_str() ) );
 
+    if( fileInfo.isDir() )
+      continue;
+
     if ( !fileInfo.exists() )
       return true;
 
diff -Nru goldendict-1.5.0~git20131003/dictionary.hh goldendict-1.5.0~git20150923/dictionary.hh
--- goldendict-1.5.0~git20131003/dictionary.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictionary.hh	2015-09-23 08:26:24.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mutex.hh"
 #include "wstring.hh"
 #include "langcoder.hh"
+#include "config.hh"
 
 /// Abstract dictionary-related stuff
 namespace Dictionary {
@@ -153,6 +154,9 @@
   bool isUncertain() const
   { return uncertain; }
 
+  /// Add match if one is not presented in matches list
+  void addMatch( WordMatch const & match );
+
 protected:
 
   // Subclasses should be filling up the 'matches' array, locking the mutex when
@@ -259,6 +263,8 @@
   QString dictionaryDescription;
   QIcon dictionaryIcon, dictionaryNativeIcon;
   bool dictionaryIconLoaded;
+  bool can_FTS;
+  QAtomicInt FTS_index_completed;
 
   // Load user icon if it exist
   // By default set icon to empty
@@ -384,6 +390,12 @@
   virtual sptr< DataRequest > getResource( string const & /*name*/ )
     throw( std::exception );
 
+  /// Returns a results of full-text search of given string similar getArticle().
+  virtual sptr< DataRequest > getSearchResults( QString const & searchString,
+                                                int searchMode, bool matchCase,
+                                                int distanceBetweenWords,
+                                                int maxArticlesPerDictionary );
+
   // Return dictionary description if presented
   virtual QString const& getDescription();
 
@@ -400,6 +412,26 @@
   virtual bool isLocalDictionary()
   { return false; }
 
+  /// Dictionary can full-text search
+  bool canFTS()
+  { return can_FTS; }
+
+  /// Dictionary have index for full-text search
+  bool haveFTSIndex()
+  { return FTS_index_completed != 0; }
+
+  /// Make index for full-text search
+  virtual void makeFTSIndex( QAtomicInt &, bool )
+  {}
+
+  /// Set full-text search parameters
+  virtual void setFTSParameters( Config::FullTextSearch const & )
+  {}
+
+  /// Retrieve all dictionary headwords
+  virtual bool getHeadwords( QStringList & )
+  { return false; }
+
   virtual ~Class()
   {}
 };
diff -Nru goldendict-1.5.0~git20131003/dictserver.cc goldendict-1.5.0~git20150923/dictserver.cc
--- goldendict-1.5.0~git20131003/dictserver.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictserver.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,875 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "dictserver.hh"
+#include "wstring_qt.hh"
+#include <QUrl>
+#include <QTcpSocket>
+#include <QString>
+#include <list>
+#include "gddebug.hh"
+#include "htmlescape.hh"
+
+namespace DictServer {
+
+using namespace Dictionary;
+
+enum {
+  DefaultPort = 2628
+};
+
+namespace {
+
+#define MAX_MATCHES_COUNT 60
+
+bool readLine( QTcpSocket & socket, QString & line,
+               QString & errorString, QAtomicInt & isCancelled )
+{
+  line.clear();
+  errorString.clear();
+  if( socket.state() != QTcpSocket::ConnectedState )
+    return false;
+
+  for( ; ; )
+  {
+    if( isCancelled )
+      return false;
+
+    if( socket.canReadLine() )
+    {
+      QByteArray reply = socket.readLine();
+      line = QString::fromUtf8( reply.data(), reply.size() );
+      return true;
+    }
+
+    if( !socket.waitForReadyRead( 2000 ) )
+    {
+      errorString = "Data reading error: socket error " + QString::number( socket.error() )
+                    + ": \"" + socket.errorString() + "\"";
+      break;
+    }
+  }
+  return false;
+}
+
+bool connectToServer( QTcpSocket & socket, QString const & url,
+                      QString & errorString, QAtomicInt & isCancelled )
+{
+  QUrl serverUrl( url );
+  quint16 port = serverUrl.port( DefaultPort );
+  QString reply;
+
+  for( ; ; )
+  {
+    if( isCancelled )
+      return false;
+
+    socket.connectToHost( serverUrl.host(), port );
+
+    if( socket.state() != QTcpSocket::ConnectedState )
+    {
+      if( !socket.waitForConnected( 5000 ) )
+        break;
+    }
+
+    if( isCancelled )
+      return false;
+
+    if( !readLine( socket, reply, errorString, isCancelled ) )
+      break;
+
+    if( !reply.isEmpty() && reply.left( 3 ) != "220" )
+    {
+      errorString = "Server refuse connection: " + reply;
+      return false;
+    }
+
+    socket.write( QByteArray( "CLIENT GoldenDict\r\n") );
+    if( !socket.waitForBytesWritten( 1000 ) )
+      break;
+
+    if( isCancelled )
+      return false;
+
+    if( !readLine( socket, reply, errorString, isCancelled ) )
+      break;
+
+    if( !serverUrl.userInfo().isEmpty() )
+    {
+      QString authCommand = QString( "AUTH " );
+
+      int pos = serverUrl.userInfo().indexOf( QRegExp( "[:;]" ) );
+      if( pos > 0 )
+        authCommand += serverUrl.userInfo().left( pos )
+                       + " " + serverUrl.userInfo().mid( pos + 1 );
+      else
+        authCommand += serverUrl.userInfo();
+
+      authCommand += "\r\n";
+
+      socket.write( authCommand.toUtf8() );
+
+      if( isCancelled )
+        return false;
+
+      if( socket.waitForBytesWritten( 1000 ) )
+        break;
+
+      if( isCancelled )
+        return false;
+
+      if( readLine( socket, reply, errorString, isCancelled ) )
+        break;
+
+      if( reply.left( 3 ) != "230" )
+      {
+        errorString = "Authentication error: " + reply;
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  if( !isCancelled )
+    errorString = QString( "Server connection fault, socket error %1: \"%2\"" )
+                  .arg( QString::number( socket.error() ) )
+                  .arg( socket.errorString() );
+  return false;
+}
+
+void disconnectFromServer( QTcpSocket & socket )
+{
+  if( socket.state() == QTcpSocket::ConnectedState )
+    socket.write( QByteArray( "QUIT\r\n" ) );
+
+  socket.disconnectFromHost();
+}
+
+class DictServerDictionary: public Dictionary::Class
+{
+  string name;
+  QString url, icon;
+  quint32 langId;
+  QString errorString;
+  QTcpSocket socket;
+  QStringList databases;
+  QStringList strategies;
+  QStringList serverDatabases;
+
+public:
+
+  DictServerDictionary( string const & id, string const & name_,
+                        QString const & url_,
+                        QString const & database_,
+                        QString const & strategies_,
+                        QString const & icon_ ):
+    Dictionary::Class( id, vector< string >() ),
+    name( name_ ),
+    url( url_ ),
+    icon( icon_ ),
+    langId( 0 )
+  {
+    int pos = url.indexOf( "://" );
+    if( pos < 0 )
+      url = "dict://" + url;
+
+    databases = database_.split( QRegExp( "[ ,;]" ), QString::SkipEmptyParts );
+    if( databases.isEmpty() )
+      databases.append( "*" );
+
+    strategies = strategies_.split( QRegExp( "[ ,;]" ), QString::SkipEmptyParts );
+    if( strategies.isEmpty() )
+      strategies.append( "prefix" );
+  }
+
+  virtual string getName() throw()
+  { return name; }
+
+  virtual map< Property, string > getProperties() throw()
+  { return map< Property, string >(); }
+
+  virtual unsigned long getArticleCount() throw()
+  { return 0; }
+
+  virtual unsigned long getWordCount() throw()
+  { return 0; }
+
+  virtual sptr< WordSearchRequest > prefixMatch( wstring const &,
+                                                 unsigned long maxResults ) throw( std::exception );
+
+  virtual sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts,
+                                          wstring const & )
+    throw( std::exception );
+
+  virtual quint32 getLangFrom() const
+  { return langId; }
+
+  virtual quint32 getLangTo() const
+  { return langId; }
+
+  virtual QString const & getDescription();
+protected:
+
+  virtual void loadIcon() throw();
+
+  void getServerDatabases();
+
+  friend class DictServerWordSearchRequest;
+  friend class DictServerArticleRequest;
+};
+
+void DictServerDictionary::loadIcon() throw()
+{
+  if ( dictionaryIconLoaded )
+    return;
+
+  if( !icon.isEmpty() )
+  {
+    QFileInfo fInfo(  QDir( Config::getConfigDir() ), icon );
+    if( fInfo.isFile() )
+      loadIconFromFile( fInfo.absoluteFilePath(), true );
+  }
+  if( dictionaryIcon.isNull() )
+    dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/network.png");
+  dictionaryIconLoaded = true;
+}
+
+QString const & DictServerDictionary::getDescription()
+{
+  if( serverDatabases.isEmpty() )
+  {
+    dictionaryDescription.clear();
+    getServerDatabases();
+  }
+
+  if( dictionaryDescription.isEmpty() )
+  {
+    dictionaryDescription = QCoreApplication::translate( "DictServer", "Url: " ) + url + "\n";
+    dictionaryDescription += QCoreApplication::translate( "DictServer", "Databases: " ) + databases.join( ", " ) + "\n";
+    dictionaryDescription += QCoreApplication::translate( "DictServer", "Search strategies: " ) + strategies.join( ", " );
+    if( !serverDatabases.isEmpty() )
+    {
+      dictionaryDescription += "\n\n";
+      dictionaryDescription += QCoreApplication::translate( "DictServer", "Server databases" )
+                               + " (" + QString::number( serverDatabases.size()) + "):";
+      for( QStringList::const_iterator i = serverDatabases.begin(); i != serverDatabases.end(); ++i )
+        dictionaryDescription += "\n" + *i;
+    }
+  }
+  return dictionaryDescription;
+}
+
+void DictServerDictionary::getServerDatabases()
+{
+  QAtomicInt isCancelled;
+  QTcpSocket * socket = new QTcpSocket;
+
+  if( !socket )
+    return;
+
+  if( connectToServer( *socket, url, errorString, isCancelled ) )
+  {
+    for( ; ; )
+    {
+      QString req = QString( "SHOW DB\r\n" );
+      socket->write( req.toUtf8() );
+      socket->waitForBytesWritten( 1000 );
+
+      QString reply;
+
+      if( !readLine( *socket, reply, errorString, isCancelled ) )
+        return;
+
+      if( reply.left( 3 ) == "110" )
+      {
+        int countPos = reply.indexOf( ' ', 4 );
+        // Get databases count
+        int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
+
+        // Read databases
+        for( int x = 0; x < count; x++ )
+        {
+          if( !readLine( *socket, reply, errorString, isCancelled ) )
+             break;
+
+          if( reply[ 0 ] == '.' )
+            break;
+
+          while( reply.endsWith( '\r' ) || reply.endsWith( '\n' ) )
+            reply.chop( 1 );
+
+          if( !reply.isEmpty() )
+            serverDatabases.append( reply );
+        }
+
+        break;
+      }
+      else
+      {
+        gdWarning( "Retrieving databases from \"%s\" fault: %s\n",
+                   getName().c_str(), reply.toUtf8().data() );
+        break;
+      }
+    }
+    disconnectFromServer( *socket );
+  }
+
+  if( !errorString.isEmpty() )
+    gdWarning( "Retrieving databases from \"%s\" fault: %s\n",
+               getName().c_str(), errorString.toUtf8().data() );
+  delete socket;
+}
+
+class DictServerWordSearchRequest;
+
+class DictServerWordSearchRequestRunnable: public QRunnable
+{
+  DictServerWordSearchRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  DictServerWordSearchRequestRunnable( DictServerWordSearchRequest & r_,
+                                       QSemaphore & hasExited_ ): r( r_ ),
+                                       hasExited( hasExited_ )
+  {}
+
+  ~DictServerWordSearchRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class DictServerWordSearchRequest: public Dictionary::WordSearchRequest
+{
+  QAtomicInt isCancelled;
+  wstring word;
+  QString errorString;
+  QSemaphore hasExited;
+  DictServerDictionary & dict;
+  QTcpSocket * socket;
+
+public:
+
+  DictServerWordSearchRequest( wstring const & word_,
+                               DictServerDictionary & dict_ ) :
+    word( word_ ),
+    dict( dict_ ),
+    socket( 0 )
+  {
+    QThreadPool::globalInstance()->start(
+      new DictServerWordSearchRequestRunnable( *this, hasExited ) );
+  }
+
+  void run();
+
+  ~DictServerWordSearchRequest()
+  {
+    hasExited.acquire();
+  }
+
+  virtual void cancel();
+
+};
+
+void DictServerWordSearchRequestRunnable::run()
+{
+  r.run();
+}
+
+void DictServerWordSearchRequest::run()
+{
+  if( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  socket = new QTcpSocket;
+
+  if( !socket )
+  {
+    finish();
+    return;
+  }
+
+  if( connectToServer( *socket, dict.url, errorString, isCancelled ) )
+  {
+    QStringList matchesList;
+
+    for( int ns = 0; ns < dict.strategies.size(); ns++ )
+    {
+      for( int i = 0; i < dict.databases.size(); i++ )
+      {
+        QString matchReq = QString( "MATCH " )
+                           + dict.databases.at( i )
+                           + " " + dict.strategies.at( ns )
+                           + " \"" + gd::toQString( word )
+                           + "\"\r\n";
+        socket->write( matchReq.toUtf8() );
+        socket->waitForBytesWritten( 1000 );
+
+        if( isCancelled )
+          break;
+
+        QString reply;
+
+        if( !readLine( *socket, reply, errorString, isCancelled ) )
+          break;
+
+        if( isCancelled )
+          break;
+
+        if( reply.left( 3 ) == "250" )
+        {
+          // "OK" reply - matches info will be later
+          if( !readLine( *socket, reply, errorString, isCancelled ) )
+            break;
+
+          if( isCancelled )
+            break;
+        }
+
+        if( reply.left( 3 ) == "552" )
+        {
+          // No matches
+          continue;
+        }
+
+        if( reply[ 0 ] == '5' || reply[ 0 ] == '4' )
+        {
+          // Database error
+          gdWarning( "Find matches in \"%s\", database \"%s\", strategy \"%s\" fault: %s\n",
+                     dict.getName().c_str(), dict.databases.at( i ).toUtf8().data(),
+                     dict.strategies.at( ns ).toUtf8().data(), reply.toUtf8().data() );
+          continue;
+        }
+
+        if( reply.left( 3 ) == "152" )
+        {
+          // Matches found
+          int countPos = reply.indexOf( ' ', 4 );
+
+          // Get matches count
+          int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
+
+          // Read matches
+          for( int x = 0; x <= count; x++ )
+          {
+            if( isCancelled )
+              break;
+
+            if( !readLine( *socket, reply, errorString, isCancelled ) )
+              break;
+
+            if( reply[ 0 ] == '.' )
+              break;
+
+            while( reply.endsWith( '\r' ) || reply.endsWith( '\n' ) )
+              reply.chop( 1 );
+
+            int pos = reply.indexOf( ' ' );
+            if( pos >= 0 )
+            {
+              QString word = reply.mid( pos + 1 );
+              if( word.endsWith( '\"') )
+                word.chop( 1 );
+              if( word[ 0 ] ==  '\"' )
+                word = word.mid( 1 );
+
+              matchesList.append( word );
+            }
+          }
+          if( isCancelled || !errorString.isEmpty() )
+            break;
+        }
+      }
+
+      if( isCancelled || !errorString.isEmpty() )
+        break;
+
+      matchesList.removeDuplicates();
+      if( matchesList.size() >= MAX_MATCHES_COUNT )
+        break;
+    }
+
+    if( !isCancelled && errorString.isEmpty() )
+    {
+      matchesList.removeDuplicates();
+
+      int count = matchesList.size();
+      if( count > MAX_MATCHES_COUNT )
+        count = MAX_MATCHES_COUNT;
+
+      if( count )
+      {
+        Mutex::Lock _( dataMutex );
+        for( int x = 0; x < count; x++ )
+          matches.push_back( gd::toWString( matchesList.at( x ) ) );
+      }
+    }
+  }
+
+  if( !errorString.isEmpty() )
+    gdWarning( "Prefix find in \"%s\" fault: %s\n", dict.getName().c_str(),
+                errorString.toUtf8().data() );
+
+  if( isCancelled )
+    socket->abort();
+  else
+    disconnectFromServer( *socket );
+
+  delete socket;
+  if( !isCancelled )
+    finish();
+}
+
+void DictServerWordSearchRequest::cancel()
+{
+  isCancelled.ref();
+
+  Mutex::Lock _( dataMutex );
+  finish();
+}
+
+class DictServerArticleRequest;
+
+class DictServerArticleRequestRunnable: public QRunnable
+{
+  DictServerArticleRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  DictServerArticleRequestRunnable( DictServerArticleRequest & r_,
+                                    QSemaphore & hasExited_ ): r( r_ ),
+                                    hasExited( hasExited_ )
+  {}
+
+  ~DictServerArticleRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class DictServerArticleRequest: public Dictionary::DataRequest
+{
+  QAtomicInt isCancelled;
+  wstring word;
+  QString errorString;
+  QSemaphore hasExited;
+  DictServerDictionary & dict;
+  QTcpSocket * socket;
+
+public:
+
+  DictServerArticleRequest( wstring const & word_,
+                            DictServerDictionary & dict_ ) :
+    word( word_ ),
+    dict( dict_ ),
+    socket( 0 )
+  {
+    QThreadPool::globalInstance()->start(
+      new DictServerArticleRequestRunnable( *this, hasExited ) );
+  }
+
+  void run();
+
+  ~DictServerArticleRequest()
+  {
+    hasExited.acquire();
+  }
+
+  virtual void cancel();
+
+};
+
+void DictServerArticleRequestRunnable::run()
+{
+  r.run();
+}
+
+void DictServerArticleRequest::run()
+{
+  if( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  socket = new QTcpSocket;
+
+  if( !socket )
+  {
+    finish();
+    return;
+  }
+
+  if( connectToServer( *socket, dict.url, errorString, isCancelled ) )
+  {
+    string articleData;
+
+    for( int i = 0; i < dict.databases.size(); i++ )
+    {
+      QString matchReq = QString( "DEFINE " )
+                         + dict.databases.at( i )
+                         + " \"" + gd::toQString( word ) + "\"\r\n";
+      socket->write( matchReq.toUtf8() );
+      socket->waitForBytesWritten( 1000 );
+
+      QString reply;
+
+      if( isCancelled )
+        break;
+
+      if( !readLine( *socket, reply, errorString, isCancelled ) )
+        break;
+
+      if( isCancelled )
+        break;
+
+      if( reply.left( 3 ) == "250" )
+      {
+        // "OK" reply - matches info will be later
+        if( !readLine( *socket, reply, errorString, isCancelled ) )
+          break;
+
+        if( isCancelled )
+          break;
+      }
+
+      if( reply.left( 3 ) == "552" )
+      {
+        // No matches found
+        continue;
+      }
+
+      if( reply[ 0 ] == '5' || reply[ 0 ] == '4' )
+      {
+        // Database error
+        gdWarning( "Articles request from \"%s\", database \"%s\" fault: %s\n",
+                   dict.getName().c_str(), dict.databases.at( i ).toUtf8().data(),
+                   reply.toUtf8().data() );
+        continue;
+      }
+
+      if( reply.left( 3 ) == "150" )
+      {
+        // Articles found
+        int countPos = reply.indexOf( ' ', 4 );
+
+        QString articleText;
+
+        // Get articles count
+        int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
+
+        // Read articles
+        for( int x = 0; x < count; x++ )
+        {
+          if( isCancelled )
+            break;
+
+          if( !readLine( *socket, reply, errorString, isCancelled ) )
+            break;
+
+          if( reply.left( 3 ) == "250" )
+            break;
+
+          if( reply.left( 3 ) == "151" )
+          {
+            int pos = 4;
+            int endPos;
+
+            // Skip requested word
+            if( reply[ pos ] == '\"' )
+              endPos = reply.indexOf( '\"', pos + 1 ) + 1;
+            else
+              endPos = reply.indexOf( ' ', pos );
+
+            if( endPos < pos )
+            {
+              // It seems mailformed string
+              break;
+            }
+
+            pos = endPos + 1;
+
+            QString dbID, dbName;
+
+            // Retrieve database ID
+            endPos = reply.indexOf( ' ', pos );
+
+            if( endPos < pos )
+            {
+              // It seems mailformed string
+              break;
+            }
+
+            dbID = reply.mid( pos, endPos - pos );
+
+            // Retrieve database ID
+            pos = endPos + 1;
+            endPos = reply.indexOf( ' ', pos );
+            if( reply[ pos ] == '\"' )
+              endPos = reply.indexOf( '\"', pos + 1 ) + 1;
+            else
+              endPos = reply.indexOf( ' ', pos );
+
+            if( endPos < pos )
+            {
+              // It seems mailformed string
+              break;
+            }
+
+            dbName = reply.mid( pos, endPos - pos );
+            if( dbName.endsWith( '\"' ) )
+              dbName.chop( 1 );
+            if( dbName[ 0 ] == '\"' )
+              dbName = dbName.mid( 1 );
+
+            articleData += string( "<div class=\"dictserver_from\">From " )
+                           + dbName.toUtf8().data()
+                           + " [" + dbID.toUtf8().data() + "]:"
+                           + "</div>";
+
+            // Retrieve article text
+
+            articleText.clear();
+            for( ; ; )
+            {
+              if( !readLine( *socket, reply, errorString, isCancelled ) )
+                break;
+
+              if( reply == ".\r\n" )
+                break;
+
+              articleText += reply;
+            }
+
+            if( isCancelled || !errorString.isEmpty() )
+              break;
+
+            QRegExp phonetic( "\\\\([^\\\\]+)\\\\", Qt::CaseInsensitive ); // phonetics: \stuff\ ...
+            QRegExp refs( "\\{([^\\{\\}]+)\\}", Qt::CaseInsensitive );     // links: {stuff}
+            QRegExp links( "<a href=\"gdlookup://localhost/([^\"]*)\">", Qt::CaseInsensitive );
+            QRegExp tags( "<[^>]*>", Qt::CaseInsensitive );
+
+            string articleStr = Html::preformat( articleText.toUtf8().data() );
+            articleText = QString::fromUtf8( articleStr.c_str(), articleStr.size() )
+                          .replace(phonetic, "<span class=\"dictd_phonetic\">\\1</span>" )
+                          .replace(refs, "<a href=\"gdlookup://localhost/\\1\">\\1</a>" );
+            pos = 0;
+            for( ; ; )
+            {
+              pos = articleText.indexOf( links, pos );
+              if( pos < 0 )
+                break;
+
+              QString link = links.cap( 1 );
+              link.replace( tags, " " );
+              link.replace( "&nbsp;", " " );
+              articleText.replace( pos + 30, links.cap( 1 ).length(),
+                                   link.simplified() );
+              pos += 30;
+            }
+
+            articleData += string( "<div class=\"dictd_article\">" )
+                           + articleText.toUtf8().data()
+                           + "<br></div>";
+          }
+
+          if( isCancelled || !errorString.isEmpty() )
+            break;
+        }
+      }
+    }
+    if( !isCancelled && errorString.isEmpty() && !articleData.empty() )
+    {
+      Mutex::Lock _( dataMutex );
+
+      data.resize( articleData.size() );
+      memcpy( &data.front(), articleData.data(), articleData.size() );
+
+      hasAnyData = true;
+    }
+  }
+
+  if( !errorString.isEmpty() )
+    gdWarning( "Articles request from \"%s\" fault: %s\n", dict.getName().c_str(),
+                errorString.toUtf8().data() );
+
+  if( isCancelled )
+    socket->abort();
+  else
+    disconnectFromServer( *socket );
+
+  delete socket;
+  if( !isCancelled )
+    finish();
+}
+
+void DictServerArticleRequest::cancel()
+{
+  isCancelled.ref();
+
+  Mutex::Lock _( dataMutex );
+  finish();
+}
+
+sptr< WordSearchRequest > DictServerDictionary::prefixMatch( wstring const & word,
+                                                             unsigned long maxResults )
+  throw( std::exception )
+{
+  (void) maxResults;
+  if ( word.size() > 80 )
+  {
+    // Don't make excessively large queries -- they're fruitless anyway
+
+    return new WordSearchRequestInstant();
+  }
+  else
+    return new DictServerWordSearchRequest( word, *this );
+}
+
+sptr< DataRequest > DictServerDictionary::getArticle( wstring const & word,
+                                                      vector< wstring > const &,
+                                                      wstring const & )
+  throw( std::exception )
+{
+  if ( word.size() > 80 )
+  {
+    // Don't make excessively large queries -- they're fruitless anyway
+
+    return new DataRequestInstant( false );
+  }
+  else
+    return new DictServerArticleRequest( word, *this );
+}
+
+} // Anonimuos namespace
+
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::DictServers const & servers )
+  throw( std::exception )
+{
+  vector< sptr< Dictionary::Class > > result;
+
+  for( int x = 0; x < servers.size(); ++x )
+  {
+    if ( servers[ x ].enabled )
+      result.push_back( new DictServerDictionary( servers[ x ].id.toStdString(),
+                                                  servers[ x ].name.toUtf8().data(),
+                                                  servers[ x ].url,
+                                                  servers[ x ].databases,
+                                                  servers[ x ].strategies,
+                                                  servers[ x ].iconFilename  ) );
+  }
+
+  return result;
+}
+
+} // namespace DictServer
diff -Nru goldendict-1.5.0~git20131003/dictserver.hh goldendict-1.5.0~git20150923/dictserver.hh
--- goldendict-1.5.0~git20131003/dictserver.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictserver.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef __DICTSERVER_HH__INCLUDED__
+#define __DICTSERVER_HH__INCLUDED__
+
+#include "dictionary.hh"
+#include "config.hh"
+
+/// Support for servers supporting DICT protocol.
+namespace DictServer {
+
+using std::vector;
+using std::string;
+
+vector< sptr< Dictionary::Class > > makeDictionaries(
+                                      Config::DictServers const & servers )
+    throw( std::exception );
+
+}
+
+#endif // __DICTSERVER_HH__INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/dictzip.c goldendict-1.5.0~git20150923/dictzip.c
--- goldendict-1.5.0~git20131003/dictzip.c	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictzip.c	2015-09-23 08:26:24.000000000 +0000
@@ -257,8 +257,9 @@
 # endif
 #endif
 
-static int dict_read_header( const char *filename,
-			     dictData *header, int computeCRC )
+static enum  DZ_ERRORS dict_read_header( const char *filename,
+					 dictData *header,
+					 int computeCRC )
 {
    FILE          *str;
    int           id1, id2, si1, si2;
@@ -276,7 +277,7 @@
    {
       err_fatal_errno( __func__,
 		       "Cannot open data file \"%s\" for read\n", filename );
-      return 1;
+      return DZ_ERR_OPENFILE;
    }
 
    header->filename     = NULL;//str_find( filename );
@@ -302,7 +303,7 @@
       }
       header->crc = crc;
       fclose( str );
-      return 0;
+      return DZ_NOERROR;
    }
    header->type = DICT_GZIP;
    
@@ -334,7 +335,7 @@
 			  "dzip header version %d not supported\n",
 			  header->version );
 	    fclose( str );
-	    return 1;
+	    return DZ_ERR_UNSUPPORTED_FORMAT;
 	 }
    
 	 header->chunkLength  = getc( str ) << 0;
@@ -344,10 +345,14 @@
 	 
 	 if (header->chunkCount <= 0) {
 	    fclose( str );
-	    return 5;
+	    return DZ_ERR_INVALID_FORMAT;
 	 }
 	 header->chunks = xmalloc( sizeof( header->chunks[0] )
 				   * header->chunkCount );
+	 if( header->chunks == 0 ) {
+	   return DZ_ERR_NOMEMORY;
+	 }
+
 	 for (i = 0; i < header->chunkCount; i++) {
 	    header->chunks[i]  = getc( str ) << 0;
 	    header->chunks[i] |= getc( str ) << 8;
@@ -368,7 +373,9 @@
 	       __func__,
 	       "too long FNAME field in dzip file \"%s\"\n", filename);
 	    fclose( str );
-	    return 1;
+	    if( header->chunks )
+	      free( header->chunks );
+	    return DZ_ERR_INVALID_FORMAT;
 	 }
       }
 
@@ -389,7 +396,9 @@
 	       __func__,
 	       "too long COMMENT field in dzip file \"%s\"\n", filename);
 	    fclose( str );
-	    return 1;
+	    if( header->chunks )
+	      free( header->chunks );
+	    return DZ_ERR_INVALID_FORMAT;
 	 }
       }
 
@@ -412,7 +421,9 @@
 		    "File position (%lu) != header length + 1 (%d)\n",
 		    ftell( str ), header->headerLength + 1 );
       fclose( str );
-      return 1;
+      if( header->chunks )
+        free( header->chunks );
+      return DZ_ERR_INVALID_FORMAT;
    }
 
    fseek( str, -8, SEEK_END );
@@ -429,6 +440,12 @@
 				/* Compute offsets */
    header->offsets = xmalloc( sizeof( header->offsets[0] )
 			      * header->chunkCount );
+   if( header->offsets == 0 ) {
+     if( header->chunks )
+       free( header->chunks );
+     return DZ_ERR_NOMEMORY;
+   }
+
    for (offset = header->headerLength + 1, i = 0;
 	i < header->chunkCount;
 	i++)
@@ -438,19 +455,29 @@
    }
 
    fclose( str );
-   return 0;
+   return DZ_NOERROR;
 }
 
-dictData *dict_data_open( const char *filename, int computeCRC )
+dictData *dict_data_open( const char *filename,
+                          enum DZ_ERRORS * error,
+                          int computeCRC )
 {
    dictData    *h = NULL;
 //   struct stat sb;
    int         j;
 
    if (!filename)
-      return NULL;
+   {
+     *error = DZ_ERR_OPENFILE;
+     return NULL;
+   }
 
    h = xmalloc( sizeof( struct dictData ) );
+   if( h == 0 )
+   {
+     *error = DZ_ERR_NOMEMORY;
+     return 0;
+   }
 
    memset( h, 0, sizeof( struct dictData ) );
 #ifdef __WIN32
@@ -463,7 +490,8 @@
 #ifdef __WIN32
      wchar_t wname[16384];
 #endif
-     if (dict_read_header( filename, h, computeCRC )) {
+     *error = dict_read_header( filename, h, computeCRC );
+     if ( *error != DZ_NOERROR ) {
        break; /*
         err_fatal( __func__,
        "\"%s\" not in text or dzip format\n", filename );*/
@@ -471,12 +499,18 @@
 
 #ifdef __WIN32
      if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
+     {
+       *error = DZ_ERR_OPENFILE;
        break;
+     }
 
      h->fd = CreateFileW( wname, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0,
                           OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
      if( h->fd == INVALID_HANDLE_VALUE )
+     {
+       *error = DZ_ERR_OPENFILE;
        break;
+     }
 
      h->size = GetFileSize( h->fd, 0 );
 #else
@@ -484,6 +518,7 @@
 
      if ( !h->fd )
      {
+       *error = DZ_ERR_OPENFILE;
        break;
         /*err_fatal_errno( __func__,
              "Cannot open data file \"%s\"\n", filename );*/
@@ -501,6 +536,7 @@
         h->cache[j].count    = 0;
      }
 
+     *error = DZ_NOERROR;
      return h;
    }
    dict_data_close( h );
@@ -563,7 +599,7 @@
    buffer = xmalloc( size + 1 );
    if( !buffer )
    {
-     strcpy( h->errorString, "Cannot allocate memory" );
+     strcpy( h->errorString, dz_error_str( DZ_ERR_NOMEMORY ) );
      return 0;
    }
 
@@ -603,7 +639,7 @@
           fread( buffer, size, 1, h->fd ) != 1 )
 #endif
      {
-       strcpy( h->errorString, "Cannot read file" );
+       strcpy( h->errorString, dz_error_str( DZ_ERR_READFILE ) );
        xfree( buffer );
        return 0;
      }
@@ -681,6 +717,12 @@
 	    if (!h->cache[target].inBuffer)
 	       h->cache[target].inBuffer = xmalloc( h->chunkLength );
 	    inBuffer = h->cache[target].inBuffer;
+	    if( !inBuffer )
+	    {
+	      strcpy( h->errorString, dz_error_str( DZ_ERR_NOMEMORY ) );
+	      xfree( buffer );
+	      return 0;
+	    }
 
 	    if (h->chunks[i] >= OUT_BUFFER_SIZE ) {
 /*
@@ -699,12 +741,13 @@
       readed = 0;
       if( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
         ReadFile( h->fd, outBuffer, h->chunks[ i ], &readed, 0 );
-      if( h->chunks[ i ] != readed )
+      if( h->chunks[ i ] != (int)readed )
 #else
       if ( fseek( h->fd, h->offsets[ i ], SEEK_SET ) != 0 ||
            fread( outBuffer, h->chunks[ i ], 1, h->fd ) != 1 )
 #endif
       {
+        strcpy( h->errorString, dz_error_str( DZ_ERR_READFILE ) );
         xfree( buffer );
         return 0;
       }
@@ -780,7 +823,7 @@
       xfree( buffer );
       return 0;
    }
-   
+   h->errorString[ 0 ] = 0;
    return buffer;
 }
 
@@ -788,3 +831,18 @@
 {
   return data->errorString;
 }
+
+const char * dz_error_str( enum DZ_ERRORS error )
+{
+  switch( error )
+  {
+    case DZ_NOERROR:                return "No error";
+    case DZ_ERR_OPENFILE:           return "Open file error";
+    case DZ_ERR_READFILE:           return "Read file error";
+    case DZ_ERR_INVALID_FORMAT:     return "Invalid file format";
+    case DZ_ERR_UNSUPPORTED_FORMAT: return "Unsupported file format";
+    case DZ_ERR_NOMEMORY:           return "Memory allocation error";
+    case DZ_ERR_INTERNAL:           return "Internal error";
+  }
+  return "Unknown error";
+}
diff -Nru goldendict-1.5.0~git20131003/dictzip.h goldendict-1.5.0~git20150923/dictzip.h
--- goldendict-1.5.0~git20131003/dictzip.h	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/dictzip.h	2015-09-23 08:26:24.000000000 +0000
@@ -48,6 +48,16 @@
    int           count;
 } dictCache;
 
+enum DZ_ERRORS {
+  DZ_NOERROR = 0,
+  DZ_ERR_INTERNAL,
+  DZ_ERR_OPENFILE,
+  DZ_ERR_READFILE,
+  DZ_ERR_UNSUPPORTED_FORMAT,
+  DZ_ERR_INVALID_FORMAT,
+  DZ_ERR_NOMEMORY
+};
+
 typedef struct dictData {
 #ifdef __WIN32
    HANDLE        fd;		/* file handle */
@@ -86,7 +96,7 @@
 
 /* initialize .data file */
 extern dictData *dict_data_open (
-   const char *filename, int computeCRC);
+   const char *filename, enum DZ_ERRORS * error, int computeCRC);
 /* */
 extern void dict_data_close (
    dictData *data);
@@ -99,6 +109,8 @@
 
 extern char *dict_error_str( dictData *data );
 
+extern const char *dz_error_str( enum DZ_ERRORS error );
+
 extern int        mmap_mode;
 
 #ifdef __cplusplus
diff -Nru goldendict-1.5.0~git20131003/dprintf.hh goldendict-1.5.0~git20150923/dprintf.hh
--- goldendict-1.5.0~git20131003/dprintf.hh	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/dprintf.hh	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#ifndef __DPRINTF_HH_INCLUDED__
-#define __DPRINTF_HH_INCLUDED__
-
-#ifdef NO_CONSOLE
-#define DPRINTF(...)
-#define FDPRINTF(...)
-#else
-#define DPRINTF(...) printf(__VA_ARGS__)
-#define FDPRINTF(...) fprintf(__VA_ARGS__)
-#endif
-
-#endif // __DPRINTF_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/dsl.cc goldendict-1.5.0~git20150923/dsl.cc
--- goldendict-1.5.0~git20131003/dsl.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/dsl.cc	2015-09-23 08:26:24.000000000 +0000
@@ -17,7 +17,11 @@
 #include "wstring_qt.hh"
 #include "zipfile.hh"
 #include "indexedzip.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
+#include "tiff.hh"
+#include "fulltextsearch.hh"
+#include "ftshelpers.hh"
+#include "language.hh"
 
 #include <zlib.h>
 #include <map>
@@ -39,6 +43,9 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QPainter>
+#include <QMap>
+#include <QStringList>
+#include <QRegExp>
 
 // For TIFF conversion
 #include <QImage>
@@ -69,12 +76,15 @@
 namespace {
 
 DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
+DEF_EX_STR( exDictzipError, "DICTZIP error", Dictionary::Ex )
 
 enum
 {
   Signature = 0x584c5344, // DSLX on little-endian, XLSD on big-endian
-  CurrentFormatVersion = 19 + BtreeIndexing::FormatVersion + Folding::Version,
-  CurrentZipSupportVersion = 2
+  CurrentFormatVersion = 21 + BtreeIndexing::FormatVersion + Folding::Version,
+  CurrentZipSupportVersion = 2,
+  CurrentFtsIndexVersion = 1
 };
 
 struct IdxHeader
@@ -109,12 +119,12 @@
 {
   uint32_t offset;
   uint32_t size;
-  wstring headword;
-  InsidedCard( uint32_t _offset, uint32_t _size, wstring const & word ) :
-  offset( _offset ), size( _size ), headword( word )
+  QVector< wstring > headwords;
+  InsidedCard( uint32_t _offset, uint32_t _size, QVector< wstring > const & words ) :
+  offset( _offset ), size( _size ), headwords( words )
   {}
   InsidedCard( InsidedCard const & e ) :
-  offset( e.offset ), size( e.size ), headword( e.headword )
+  offset( e.offset ), size( e.size ), headwords( e.headwords )
   {}
   InsidedCard() {}
 
@@ -202,10 +212,31 @@
   virtual sptr< Dictionary::DataRequest > getResource( string const & name )
     throw( std::exception );
 
+  virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                            int searchMode, bool matchCase,
+                                                            int distanceBetweenWords,
+                                                            int maxResults );
   virtual QString const& getDescription();
 
   virtual QString getMainFilename();
 
+  virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+  virtual void setFTSParameters( Config::FullTextSearch const & fts )
+  {
+    if( ensureInitDone().size() )
+      return;
+
+    can_FTS = fts.enabled
+              && !fts.disabledTypes.contains( "DSL", Qt::CaseInsensitive )
+              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
+
+  virtual uint32_t getFtsIndexVersion()
+  { return CurrentFtsIndexVersion; }
+
 protected:
 
   virtual void loadIcon() throw();
@@ -224,7 +255,7 @@
                     wstring & articleText );
 
   /// Converts DSL language to an Html.
-  string dslToHtml( wstring const & );
+  string dslToHtml( wstring const &, wstring const & headword = wstring() );
 
   // Parts of dslToHtml()
   string nodeToHtml( ArticleDom::Node const & );
@@ -235,6 +266,7 @@
 
   friend class DslArticleRequest;
   friend class DslResourceRequest;
+  friend class DslFTSResultsRequest;
   friend class DslDeferredInitRunnable;
 };
 
@@ -251,6 +283,14 @@
   articleNom( 0 ),
   maxPictureWidth( maxPictureWidth_ )
 {
+  can_FTS = true;
+
+  ftsIdxName = indexFile + "_FTS";
+
+  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+    FTS_index_completed.ref();
+
   // Read the dictionary name
 
   idx.seek( sizeof( idxHeader ) );
@@ -348,10 +388,12 @@
 
       // Open the .dsl file
 
-      dz = dict_data_open( getDictionaryFilenames()[ 0 ].c_str(), 0 );
+      DZ_ERRORS error;
+      dz = dict_data_open( getDictionaryFilenames()[ 0 ].c_str(), &error, 0 );
 
       if ( !dz )
-        throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
+        throw exDictzipError( string( dz_error_str( error ) )
+                              + "(" + getDictionaryFilenames()[ 0 ] + ")" );
 
       // Read the abrv, if any
 
@@ -365,7 +407,7 @@
         memcpy( &total, abrvBlock, sizeof( uint32_t ) );
         abrvBlock += sizeof( uint32_t );
 
-        DPRINTF( "Loading %u abbrv\n", total );
+        GD_DPRINTF( "Loading %u abbrv\n", total );
 
         while( total-- )
         {
@@ -494,7 +536,7 @@
     memcpy( &articleSize, articleProps + sizeof( articleOffset ),
             sizeof( articleSize ) );
 
-    DPRINTF( "offset = %x\n", articleOffset );
+    GD_DPRINTF( "offset = %x\n", articleOffset );
 
 
     char * articleBody;
@@ -536,6 +578,9 @@
   bool hadFirstHeadword = false;
   bool foundDisplayedHeadword = false;
 
+  // Check is we retrieve insided card
+  bool insidedCard = isDslWs( articleData.at( 0 ) );
+
   wstring tildeValueWithUnsorted; // This one has unsorted parts left
   for( headwordIndex = 0; ; )
   {
@@ -552,89 +597,89 @@
 
       wstring rawHeadword = wstring( articleData, begin, pos - begin );
 
-      if ( !hadFirstHeadword )
+      if( insidedCard && !rawHeadword.empty() && isDslWs( rawHeadword[ 0 ] ) )
       {
-        // We need our tilde expansion value
-        tildeValue = rawHeadword;
-
-        list< wstring > lst;
+        // Headword of the insided card
+        wstring::size_type hpos = rawHeadword.find( L'@' );
+        if( hpos != string::npos )
+        {
+          wstring head = Folding::trimWhitespace( rawHeadword.substr( hpos + 1 ) );
+          hpos = head.find( L'~' );
+          while( hpos != string::npos )
+          {
+            if( hpos == 0 || head[ hpos ] != L'\\' )
+              break;
+            hpos = head.find( L'~', hpos + 1 );
+          }
+          if( hpos == string::npos )
+            rawHeadword = head;
+          else
+            rawHeadword.clear();
+        }
+      }
 
-        expandOptionalParts( tildeValue, &lst );
+      if( !rawHeadword.empty() )
+      {
+        if ( !hadFirstHeadword )
+        {
+          // We need our tilde expansion value
+          tildeValue = rawHeadword;
 
-        if ( lst.size() ) // Should always be
-          tildeValue = lst.front();
+          list< wstring > lst;
 
-        tildeValueWithUnsorted = tildeValue;
+          expandOptionalParts( tildeValue, &lst );
 
-        processUnsortedParts( tildeValue, false );
-      }
+          if ( lst.size() ) // Should always be
+            tildeValue = lst.front();
 
-      wstring str = rawHeadword;
+          tildeValueWithUnsorted = tildeValue;
 
-      if ( hadFirstHeadword )
-        expandTildes( str, tildeValueWithUnsorted );
+          processUnsortedParts( tildeValue, false );
+        }
+        wstring str = rawHeadword;
 
-      processUnsortedParts( str, true );
+        if ( hadFirstHeadword )
+          expandTildes( str, tildeValueWithUnsorted );
 
-      str = Folding::applySimpleCaseOnly( str );
+        processUnsortedParts( str, true );
 
-      list< wstring > lst;
-      expandOptionalParts( str, &lst );
+        str = Folding::applySimpleCaseOnly( str );
 
-      // Does one of the results match the requested word? If so, we'd choose
-      // it as our headword.
+        list< wstring > lst;
+        expandOptionalParts( str, &lst );
 
-      for( list< wstring >::iterator i = lst.begin(); i != lst.end(); ++i )
-      {
-        unescapeDsl( *i );
-        normalizeHeadword( *i );
+        // Does one of the results match the requested word? If so, we'd choose
+        // it as our headword.
 
-        if ( Folding::trimWhitespace( *i ) == requestedHeadwordFolded )
+        for( list< wstring >::iterator i = lst.begin(); i != lst.end(); ++i )
         {
-          // Found it. Now we should make a displayed headword for it.
-          if ( hadFirstHeadword )
-            expandTildes( rawHeadword, tildeValueWithUnsorted );
+          unescapeDsl( *i );
+          normalizeHeadword( *i );
 
-          processUnsortedParts( rawHeadword, false );
+          if ( Folding::trimWhitespace( *i ) == requestedHeadwordFolded )
+          {
+            // Found it. Now we should make a displayed headword for it.
+            if ( hadFirstHeadword )
+              expandTildes( rawHeadword, tildeValueWithUnsorted );
 
-          displayedHeadword = rawHeadword;
+            processUnsortedParts( rawHeadword, false );
 
-          foundDisplayedHeadword = true;
-          break;
-        }
-      }
+            displayedHeadword = rawHeadword;
 
-      if( !rawHeadword.empty() && isDslWs( rawHeadword[ 0 ] ) )
-      {
-        // Headword of the insided card
-        // Take it from card if no '~' presented
-        string::size_type pos = rawHeadword.find( L'@' );
-        if( pos != string::npos )
-        {
-          wstring head = Folding::trimWhitespace( rawHeadword.substr( pos + 1 ) );
-          string::size_type tildaPos = head.find( L'~' );
-          while( tildaPos != string::npos )
-          {
-            if( tildaPos == 0 || head[ tildaPos ] != L'\\' )
-              break;
-            tildaPos = head.find( L'~', tildaPos + 1 );
-          }
-          if( tildaPos == string::npos )
-          {
-            processUnsortedParts( head, false );
-            displayedHeadword = head;
             foundDisplayedHeadword = true;
+            break;
           }
         }
-      }
 
-      if ( !foundDisplayedHeadword )
-      {
-        ++headwordIndex;
-        hadFirstHeadword = true;
+        if ( !foundDisplayedHeadword )
+        {
+          ++headwordIndex;
+          hadFirstHeadword = true;
+        }
       }
     }
 
+
     if ( pos == articleData.size() )
       break;
 
@@ -649,18 +694,40 @@
         ++pos;
     }
 
-    if ( pos == articleData.size() || isDslWs( articleData[ pos ] ) )
+    if ( pos == articleData.size() )
     {
-      // Ok, it's either end of article, or the begining of the article's text
+      // Ok, it's end of article
       break;
     }
+    if( isDslWs( articleData[ pos ] ) )
+    {
+     // Check for begin article text
+      if( insidedCard )
+      {
+        // Check for next insided headword
+        wstring::size_type hpos = articleData.find_first_of( GD_NATIVE_TO_WS( L"\n\r" ), pos );
+        if ( hpos == wstring::npos )
+          hpos = articleData.size();
+
+        wstring str = wstring( articleData, pos, hpos - pos );
+
+        hpos = str.find( L'@');
+        if( hpos == wstring::npos || str[ hpos - 1 ] == L'\\' )
+          break;
+      }
+      else
+        break;
+    }
   }
 
   if ( !foundDisplayedHeadword )
   {
     // This is strange. Anyway, use tilde expansion value, it's better
-    // than nothing.
-    displayedHeadword = tildeValue;
+    // than nothing (or requestedHeadwordFolded for insided card.
+    if( insidedCard )
+      displayedHeadword = requestedHeadwordFolded;
+    else
+      displayedHeadword = tildeValue;
   }
 
   if ( pos != articleData.size() )
@@ -669,29 +736,18 @@
     articleText.clear();
 }
 
-string DslDictionary::dslToHtml( wstring const & str )
+string DslDictionary::dslToHtml( wstring const & str, wstring const & headword )
 {
  // Normalize the string
   wstring normalizedStr = gd::normalize( str );
 
-  ArticleDom dom( normalizedStr );
+  ArticleDom dom( normalizedStr, getName(), headword );
 
   optionalPartNom = 0;
 
   string html = processNodeChildren( dom.root );
 
-  // Lines seem to indicate paragraphs in Dsls, so we enclose each line within
-  // a <p></p>.
-
-  for( size_t x = html.size(); x--; )
-    if ( html[ x ] == '\n' )
-      html.insert( x + 1, "</p><p>" );
-
-  return
-#if 0 // Enable this to enable dsl source in html as a comment
-      "<!-- DSL Source:\n" + Utf8::encode( str ) + "\n-->"
-#endif
-         "<p>" + html + "</p>";
+  return html;
 }
 
 string DslDictionary::processNodeChildren( ArticleDom::Node const & node )
@@ -706,10 +762,26 @@
 }
 string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
 {
+  string result;
+
   if ( !node.isTag )
-    return Html::escape( Utf8::encode( node.text ) );
+  {
+    result = Html::escape( Utf8::encode( node.text ) );
 
-  string result;
+    // Handle all end-of-line
+
+    string::size_type n;
+
+    // Strip all '\r'
+    while( ( n = result.find( '\r' ) ) != string::npos )
+      result.erase( n, 1 );
+
+    // Replace all '\n'
+    while( ( n = result.find( '\n' ) ) != string::npos )
+      result.replace( n, 1, "<p></p>" );
+
+    return result;
+  }
 
   if ( node.tagName == GD_NATIVE_TO_WS( L"b" ) )
     result += "<b class=\"dsl_b\">" + processNodeChildren( node ) + "</b>";
@@ -759,7 +831,7 @@
   if ( node.tagName == GD_NATIVE_TO_WS( L"com" ) )
     result += "<span class=\"dsl_com\">" + processNodeChildren( node ) + "</span>";
   else
-  if ( node.tagName == GD_NATIVE_TO_WS( L"s" ) )
+  if ( node.tagName == GD_NATIVE_TO_WS( L"s" ) || node.tagName == GD_NATIVE_TO_WS( L"video" ) )
   {
     string filename = Utf8::encode( node.renderAsText() );
     string n =
@@ -848,6 +920,12 @@
         {
           QImage img = QImage::fromData( (unsigned char *) &imgdata.front(),
                                          imgdata.size() );
+
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+          if( img.isNull() && Filetype::isNameOfTiff( filename ) )
+            GdTiff::tiffToQImage( &imgdata.front(), imgdata.size(), img );
+#endif
+
           resize = maxPictureWidth > 0
                    && img.width() > maxPictureWidth;
         }
@@ -901,7 +979,9 @@
   }
   else
   if ( node.tagName == GD_NATIVE_TO_WS( L"!trs" ) )
+  {
     result += "<span class=\"dsl_trs\">" + processNodeChildren( node ) + "</span>";
+  }
   else
   if ( node.tagName == GD_NATIVE_TO_WS( L"p") )
   {
@@ -977,7 +1057,8 @@
       }
     }
 
-    result += string( "<a class=\"dsl_ref\" href=\"" ) + url.toEncoded().data() +"\">" + processNodeChildren( node ) + "</a>";
+    result += string( "<a class=\"dsl_ref\" href=\"" ) + url.toEncoded().data() +"\">"
+              + processNodeChildren( node ) + "</a>";
   }
   else
   if ( node.tagName == GD_NATIVE_TO_WS( L"@" ) )
@@ -992,7 +1073,8 @@
     normalizeHeadword( nodeStr );
     url.setPath( gd::toQString( nodeStr ) );
 
-    result += string( "<a class=\"dsl_ref\" href=\"" ) + url.toEncoded().data() +"\">" + processNodeChildren( node ) + "</a>";
+    result += string( "<a class=\"dsl_ref\" href=\"" ) + url.toEncoded().data() +"\">"
+              + processNodeChildren( node ) + "</a>";
   }
   else
   if ( node.tagName == GD_NATIVE_TO_WS( L"sub" ) )
@@ -1092,36 +1174,306 @@
   return FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() );
 }
 
-#if 0
-vector< wstring > StardictDictionary::findHeadwordsForSynonym( wstring const & str )
-  throw( std::exception )
+void DslDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  vector< wstring > result;
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
 
-  vector< WordArticleLink > chain = findArticles( str );
 
-  wstring caseFolded = Folding::applySimpleCaseOnly( str );
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "Dsl: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "DSL: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  headword.clear();
+  text.clear();
+
+  vector< char > chunk;
+
+  char * articleProps;
+  wstring articleData;
 
-  for( unsigned x = 0; x < chain.size(); ++x )
   {
-    string headword, articleText;
+    Mutex::Lock _( idxMutex );
+    articleProps = chunks->getBlock( articleAddress, chunk );
+  }
+
+  uint32_t articleOffset, articleSize;
 
-    loadArticle( chain[ x ].articleOffset,
-                 headword, articleText );
+  memcpy( &articleOffset, articleProps, sizeof( articleOffset ) );
+  memcpy( &articleSize, articleProps + sizeof( articleOffset ),
+          sizeof( articleSize ) );
 
-    wstring headwordDecoded = Utf8::decode( headword );
+  char * articleBody;
 
-    if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) )
+  {
+    Mutex::Lock _( dzMutex );
+    articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
+  }
+
+  if ( !articleBody )
+  {
+    return;
+  }
+  else
+  {
+    try
+    {
+      articleData =
+        DslIconv::toWstring(
+          DslIconv::getEncodingNameFor( DslEncoding( idxHeader.dslEncoding ) ),
+          articleBody, articleSize );
+      free( articleBody );
+
+      // Strip DSL comments
+      bool b = false;
+      stripComments( articleData, b );
+    }
+    catch( ... )
     {
-      // The headword seems to differ from the input word, which makes the
-      // input word its synonym.
-      result.push_back( headwordDecoded );
+      free( articleBody );
+      return;
     }
   }
 
-  return result;
+  // Skip headword
+
+  size_t pos = 0;
+  wstring articleHeadword;
+
+  // Check if we retrieve insided card
+  bool insidedCard = isDslWs( articleData.at( 0 ) );
+
+  for( ; ; )
+  {
+    size_t begin = pos;
+
+    pos = articleData.find_first_of( GD_NATIVE_TO_WS( L"\n\r" ), begin );
+
+    if ( articleHeadword.empty() )
+    {
+      // Process the headword
+
+      articleHeadword = wstring( articleData, begin, pos - begin );
+
+      if( insidedCard && !articleHeadword.empty() && isDslWs( articleHeadword[ 0 ] ) )
+      {
+        // Headword of the insided card
+        wstring::size_type hpos = articleHeadword.find( L'@' );
+        if( hpos != string::npos )
+        {
+          wstring head = Folding::trimWhitespace( articleHeadword.substr( hpos + 1 ) );
+          hpos = head.find( L'~' );
+          while( hpos != string::npos )
+          {
+            if( hpos == 0 || head[ hpos ] != L'\\' )
+              break;
+            hpos = head.find( L'~', hpos + 1 );
+          }
+          if( hpos == string::npos )
+            articleHeadword = head;
+          else
+            articleHeadword.clear();
+        }
+      }
+
+      if( !articleHeadword.empty() )
+      {
+        list< wstring > lst;
+
+        expandOptionalParts( articleHeadword, &lst );
+
+        if ( lst.size() ) // Should always be
+          articleHeadword = lst.front();
+
+        processUnsortedParts( articleHeadword, true );
+      }
+    }
+
+    if ( pos == articleData.size() )
+      break;
+
+    // Skip \n\r
+
+    if ( articleData[ pos ] == '\r' )
+      ++pos;
+
+    if ( pos != articleData.size() )
+    {
+      if ( articleData[ pos ] == '\n' )
+        ++pos;
+    }
+
+    if ( pos == articleData.size() )
+    {
+      // Ok, it's end of article
+      break;
+    }
+    if( isDslWs( articleData[ pos ] ) )
+    {
+     // Check for begin article text
+      if( insidedCard )
+      {
+        // Check for next insided headword
+        wstring::size_type hpos = articleData.find_first_of( GD_NATIVE_TO_WS( L"\n\r" ), pos );
+        if ( hpos == wstring::npos )
+          hpos = articleData.size();
+
+        wstring str = wstring( articleData, pos, hpos - pos );
+
+        hpos = str.find( L'@');
+        if( hpos == wstring::npos || str[ hpos - 1 ] == L'\\' )
+          break;
+      }
+      else
+        break;
+    }
+  }
+
+  if( !articleHeadword.empty() )
+  {
+    unescapeDsl( articleHeadword );
+    normalizeHeadword( articleHeadword );
+    headword = gd::toQString( articleHeadword );
+  }
+
+  wstring articleText;
+
+  if ( pos != articleData.size() )
+    articleText = wstring( articleData, pos );
+  else
+    articleText.clear();
+
+  if( !articleText.empty() )
+  {
+    text = gd::toQString( articleText ).normalized( QString::NormalizationForm_C );
+
+    articleText.clear();
+
+    // Parse article text
+
+    // Strip some areas
+
+    const int stripTagsNumber = 5;
+    static QString stripTags[ stripTagsNumber ] =
+                                                  {
+                                                    "s",
+                                                    "url",
+                                                    "!trs",
+                                                    "video",
+                                                    "preview"
+                                                  };
+    static QString stripEndTags[ stripTagsNumber ] =
+                                                  {
+                                                    "[/s]",
+                                                    "[/url]",
+                                                    "[/!trs]",
+                                                    "[/video]",
+                                                    "[/preview]"
+                                                  };
+
+    int pos = 0;
+    while( pos >= 0 )
+    {
+      pos = text.indexOf( '[', pos, Qt::CaseInsensitive );
+      if( pos >= 0 )
+      {
+        if( ( pos > 0 && text[ pos - 1 ] == '\\' && ( pos < 2 || text[ pos - 2 ] != '\\' ) )
+              || ( pos > text.size() - 2 || text[ pos + 1 ] == '/' ) )
+        {
+          pos += 1;
+          continue;
+        }
+
+        int pos2 = text.indexOf( ']',  pos + 1, Qt::CaseInsensitive );
+        if( pos2 < 0 )
+          break;
+
+        QString tag = text.mid( pos + 1, pos2 - pos - 1 );
+
+        int n;
+        for( n = 0; n < stripTagsNumber; n++ )
+        {
+          if( tag.compare( stripTags[ n ], Qt::CaseInsensitive ) == 0 )
+          {
+            pos2 = text.indexOf( stripEndTags[ n ] , pos + stripTags[ n ].size() + 2, Qt::CaseInsensitive );
+            text.remove( pos, pos2 > 0 ? pos2 - pos + stripEndTags[ n ].length() : text.length() - pos );
+            break;
+          }
+        }
+
+        if( n >= stripTagsNumber )
+          pos += 1;
+      }
+    }
+
+    // Strip tags
+
+    text.remove( QRegExp( "\\[[^\\\\\\[\\]]+\\]", Qt::CaseInsensitive ) );
+
+    // Chech for insided cards
+
+    bool haveInsidedCards = false;
+    pos = 0;
+    while( pos >= 0 )
+    {
+      pos = text.indexOf( "@", pos );
+      if( pos > 0 && text.at( pos - 1 ) != '\\' )
+      {
+        haveInsidedCards = true;
+        break;
+      }
+
+      if( pos >= 0 )
+        pos += 1;
+    }
+
+    if( haveInsidedCards )
+    {
+      // Use base DSL parser for articles with insided cards
+      ArticleDom dom( gd::toWString( text ), getName(), articleHeadword );
+      text = gd::toQString( dom.root.renderAsText( true ) );
+    }
+    else
+    {
+      // Unescape DSL symbols
+      pos = 0;
+      while( pos >= 0 )
+      {
+        pos = text.indexOf( '\\', pos );
+        if( pos >= 0 )
+        {
+          if( text[ pos + 1 ] == '\\' )
+            pos += 1;
+
+          text.remove( pos, 1 );
+        }
+      }
+    }
+  }
 }
-#endif
 
 /// DslDictionary::getArticle()
 
@@ -1258,16 +1610,16 @@
       articleText += "<div class=\"dsl_headwords\"";
       if( dict.isFromLanguageRTL() )
         articleText += " dir=\"rtl\"";
-      articleText += ">";
+      articleText += "><p>";
 
       if( displayedHeadword.size() == 1 && displayedHeadword[0] == '<' )  // Fix special case - "<" header
           articleText += "<";                                             // dslToHtml can't handle it correctly.
       else
-        articleText += dict.dslToHtml( displayedHeadword );
+        articleText += dict.dslToHtml( displayedHeadword, displayedHeadword );
 
       /// After this may be expand button will be inserted
 
-      articleAfter += "</div>";
+      articleAfter += "</p></div>";
 
       expandTildes( articleBody, tildeValue );
 
@@ -1276,7 +1628,7 @@
         articleAfter += " dir=\"rtl\"";
       articleAfter += ">";
 
-      articleAfter += dict.dslToHtml( articleBody );
+      articleAfter += dict.dslToHtml( articleBody, displayedHeadword );
       articleAfter += "</div>";
       articleAfter += "</span>";
 
@@ -1285,7 +1637,7 @@
         string prefix = "O" + dict.getId().substr( 0, 7 ) + "_" + QString::number( dict.articleNom ).toStdString();
         string id1 = prefix + "_expand";
         string id2 = prefix + "_opt_";
-        string button = "<img src=\"qrcx://localhost/icons/expand_opt.png\" class=\"hidden_expand_opt\" id=\"" + id1 +
+        string button = " <img src=\"qrcx://localhost/icons/expand_opt.png\" class=\"hidden_expand_opt\" id=\"" + id1 +
                         "\" onclick=\"gdExpandOptPart('" + id1 + "','" + id2 +"')\" alt=\"[+]\"/>";
         if( articleText.compare( articleText.size() - 4, 4, "</p>" ) == 0 )
           articleText.insert( articleText.size() - 4, " " + button );
@@ -1297,7 +1649,7 @@
     }
     catch( std::exception &ex )
     {
-      qWarning( "DSL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      gdWarning( "DSL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
       articleText = string( "<span class=\"dsl_article\">" )
                     + string( QObject::tr( "Article loading error" ).toUtf8().constData() )
                     + "</span>";
@@ -1410,7 +1762,7 @@
     FsEncoding::separator() +
     FsEncoding::encode( resourceName );
 
-  DPRINTF( "n is %s\n", n.c_str() );
+  GD_DPRINTF( "n is %s\n", n.c_str() );
 
   try
   {
@@ -1459,6 +1811,11 @@
       QImage img = QImage::fromData( (unsigned char *) &data.front(),
                                      data.size() );
 
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+      if( img.isNull() )
+        GdTiff::tiffToQImage( &data.front(), data.size(), img );
+#endif
+
       dataMutex.unlock();
 
       if ( !img.isNull() )
@@ -1484,8 +1841,8 @@
   }
   catch( std::exception &ex )
   {
-    qWarning( "DSL: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-              resourceName.c_str(), dict.getName().c_str(), ex.what() );
+    gdWarning( "DSL: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
+               resourceName.c_str(), dict.getName().c_str(), ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1498,8 +1855,6 @@
   return new DslResourceRequest( *this, name );
 }
 
-} // anonymous namespace
-
 #if 0
 static void findCorrespondingFiles( string const & ifo,
                                     string & idx, string & dict, string & syn,
@@ -1537,6 +1892,18 @@
 }
 #endif
 
+sptr< Dictionary::DataRequest > DslDictionary::getSearchResults( QString const & searchString,
+                                                                 int searchMode, bool matchCase,
+                                                                 int distanceBetweenWords,
+                                                                 int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
+} // anonymous namespace
+
+/// makeDictionaries
+
 vector< sptr< Dictionary::Class > > makeDictionaries(
                                       vector< string > const & fileNames,
                                       string const & indicesDir,
@@ -1615,8 +1982,8 @@
         // Building the index
         initializing.indexingDictionary( Utf8::encode( scanner.getDictionaryName() ) );
 
-        qDebug() << "Dsl: Building the index for dictionary:"
-                 << gd::toQString( scanner.getDictionaryName() );
+        gdDebug( "Dsl: Building the index for dictionary: %s\n",
+                 gd::toQString( scanner.getDictionaryName() ).toUtf8().data() );
 
         File::Class idx( indexFile, "wb" );
 
@@ -1677,7 +2044,7 @@
 
                 if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset ) || curString.empty() )
                 {
-                  qWarning( "Warning: premature end of file %s\n", abrvFileName.c_str() );
+                  gdWarning( "Warning: premature end of file %s\n", abrvFileName.c_str() );
                   eof = true;
                   break;
                 }
@@ -1729,8 +2096,8 @@
           }
           catch( std::exception & e )
           {
-            qWarning( "Error reading abrv file \"%s\", error: %s. Skipping it.\n",
-                      abrvFileName.c_str(), e.what() );
+            gdWarning( "Error reading abrv file \"%s\", error: %s. Skipping it.\n",
+                       abrvFileName.c_str(), e.what() );
           }
         }
 
@@ -1763,7 +2130,7 @@
             {
               if ( !isDslWs( curString[ x ] ) )
               {
-                qWarning( "Warning: garbage string in %s at offset 0x%lX\n", i->c_str(), (unsigned long) curOffset );
+                gdWarning( "Warning: garbage string in %s at offset 0x%lX\n", i->c_str(), (unsigned long) curOffset );
                 break;
               }
             }
@@ -1787,7 +2154,7 @@
           {
             if ( ! ( hasString = scanner.readNextLineWithoutComments( curString, curOffset ) ) )
             {
-              qWarning( "Warning: premature end of file %s\n", i->c_str() );
+              gdWarning( "Warning: premature end of file %s\n", i->c_str() );
               break;
             }
 
@@ -1831,6 +2198,8 @@
           wstring headword;
           QVector< InsidedCard > insidedCards;
           uint32_t offset = curOffset;
+          QVector< wstring > insidedHeadwords;
+          unsigned linesInsideCard = 0;
 
           // Skip the article's body
           for( ; ; )
@@ -1840,7 +2209,7 @@
                  || ( curString.size() && !isDslWs( curString[ 0 ] ) ) )
             {
               if( insideInsided )
-                insidedCards.append( InsidedCard( offset, curOffset - offset, headword ) );
+                insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
               break;
             }
 
@@ -1848,20 +2217,39 @@
 
             wstring::size_type n = curString.find( L'@' );
             if( n == wstring::npos || curString[ n - 1 ] == L'\\' )
+            {
+              if( insideInsided )
+                linesInsideCard++;
+
               continue;
+            }
 
             // Handle embedded card
 
             if( insideInsided )
-              insidedCards.append( InsidedCard( offset, curOffset - offset, headword ) );
+            {
+              if( linesInsideCard )
+              {
+                insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
+
+                insidedHeadwords.clear();
+                linesInsideCard = 0;
+                offset = curOffset;
+              }
+            }
+            else
+            {
+              offset = curOffset;
+              linesInsideCard = 0;
+            }
 
-            offset = curOffset;
             headword = Folding::trimWhitespace( curString.substr( n + 1 ) );
 
             if( !headword.empty() )
             {
               processUnsortedParts( headword, true );
               expandTildes( headword, allEntryWords.front() );
+              insidedHeadwords.append( headword );
               insideInsided = true;
             }
             else
@@ -1882,19 +2270,22 @@
             chunks.addToBlock( &(*i).offset, sizeof( (*i).offset ) );
             chunks.addToBlock( &(*i).size, sizeof( (*i).size ) );
 
-            allEntryWords.clear();
-            expandOptionalParts( (*i).headword, &allEntryWords );
-
-            for( list< wstring >::iterator j = allEntryWords.begin();
-                 j != allEntryWords.end(); ++j )
+            for( int x = 0; x < (*i).headwords.size(); x++ )
             {
-              unescapeDsl( *j );
-              normalizeHeadword( *j );
-              indexedWords.addWord( *j, descOffset, maxHeadwordSize );
-            }
+              allEntryWords.clear();
+              expandOptionalParts( (*i).headwords[ x ], &allEntryWords );
 
+              for( list< wstring >::iterator j = allEntryWords.begin();
+                   j != allEntryWords.end(); ++j )
+              {
+                unescapeDsl( *j );
+                normalizeHeadword( *j );
+                indexedWords.addWord( *j, descOffset, maxHeadwordSize );
+              }
+
+              wordCount += allEntryWords.size();
+            }
             ++articleCount;
-            wordCount += allEntryWords.size();
           }
 
           if ( !hasString )
@@ -1918,7 +2309,7 @@
 
         if ( zipFileName.size() )
         {
-          DPRINTF( "Indexing zip file\n" );
+          GD_DPRINTF( "Indexing zip file\n" );
 
           idxHeader.hasZipFile = 1;
 
@@ -1980,8 +2371,8 @@
     }
     catch( std::exception & e )
     {
-      qWarning( "DSL dictionary reading failed: %s:%u, error: %s\n",
-                i->c_str(), atLine, e.what() );
+      gdWarning( "DSL dictionary reading failed: %s:%u, error: %s\n",
+                 i->c_str(), atLine, e.what() );
     }
   }
 
diff -Nru goldendict-1.5.0~git20131003/dsl_details.cc goldendict-1.5.0~git20150923/dsl_details.cc
--- goldendict-1.5.0~git20131003/dsl_details.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/dsl_details.cc	2015-09-23 08:26:24.000000000 +0000
@@ -5,9 +5,10 @@
 
 #include "folding.hh"
 #include "langcoder.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "ufile.hh"
 #include "wstring_qt.hh"
+#include "utf8.hh"
 
 #include <stdio.h>
 #include <wctype.h>
@@ -41,7 +42,7 @@
 
 /////////////// ArticleDom
 
-wstring ArticleDom::Node::renderAsText() const
+wstring ArticleDom::Node::renderAsText( bool stripTrsTag ) const
 {
   if ( !isTag )
     return text;
@@ -49,7 +50,8 @@
   wstring result;
 
   for( list< Node >::const_iterator i = begin(); i != end(); ++i )
-    result += i->renderAsText();
+    if( !stripTrsTag || i->tagName != GD_NATIVE_TO_WS( L"!trs" ) )
+      result += i->renderAsText( stripTrsTag );
 
   return result;
 }
@@ -61,9 +63,12 @@
     dest[ 0 ] == L'm' && iswdigit( dest[ 1 ] ) );
 }
 
-ArticleDom::ArticleDom( wstring const & str ):
+ArticleDom::ArticleDom( wstring const & str, string const & dictName,
+                        wstring const & headword_):
   root( Node::Tag(), wstring(), wstring() ), stringPos( str.c_str() ),
-  transcriptionCount( 0 )
+  transcriptionCount( 0 ),
+  dictionaryName( dictName ),
+  headword( headword_ )
 {
   list< Node * > stack; // Currently opened tags
 
@@ -122,8 +127,8 @@
             textNode = 0;
 
             wstring linkText = Folding::trimWhitespace( *entry );
-            processUnsortedParts( linkText, false );
-            ArticleDom nodeDom( linkText );
+            processUnsortedParts( linkText, true );
+            ArticleDom nodeDom( linkText, dictName, headword_ );
 
             Node link( Node::Tag(), GD_NATIVE_TO_WS( L"@" ), wstring() );
             for( Node::iterator n = nodeDom.root.begin(); n != nodeDom.root.end(); ++n )
@@ -229,18 +234,11 @@
             // Opening an 'mX' or 'm' tag closes any previous 'm' tag
             closeTag( GD_NATIVE_TO_WS( L"m" ), stack, false );
           }
-          
-          Node node( Node::Tag(), name, attrs );
-
-          if ( stack.empty() )
+          openTag( name, attrs, stack );
+          if ( name == GD_NATIVE_TO_WS( L"br" ) )
           {
-            root.push_back( node );
-            stack.push_back( &root.back() );
-          }
-          else
-          {
-            stack.back()->push_back( node );
-            stack.push_back( &stack.back()->back() );
+            // [br] tag don't have closing tag
+            closeTag( name, stack );
           }
         }
         else
@@ -276,7 +274,7 @@
             nextChar();
           } while( Folding::isWhitespace( ch ) );
 
-          wstring linkTo;
+          wstring linkTo, linkText;
 
           for( ; ; nextChar() )
           {
@@ -291,10 +289,21 @@
               {
                 linkTo.push_back( L'>' );
                 linkTo.push_back( ch );
+
+                linkText.push_back( L'>' );
+                if( escaped )
+                  linkText.push_back( L'\\' );
+                linkText.push_back( ch );
               }
             }
             else
+            {
               linkTo.push_back( ch );
+
+              if( escaped )
+                linkText.push_back( L'\\' );
+              linkText.push_back( ch );
+            }
           }
 
           // Add the corresponding node
@@ -306,8 +315,13 @@
             textNode = 0;
           }
 
+          linkText = Folding::trimWhitespace( linkText );
+          processUnsortedParts( linkText, true );
+          ArticleDom nodeDom( linkText, dictName, headword_ );
+
           Node link( Node::Tag(), GD_NATIVE_TO_WS( L"ref" ), wstring() );
-          link.push_back( Node( Node::Text(), linkTo ) );
+          for( Node::iterator n = nodeDom.root.begin(); n != nodeDom.root.end(); ++n )
+            link.push_back( *n );
 
           if ( stack.empty() )
             root.push_back( link );
@@ -470,10 +484,76 @@
 
   if ( stack.size() )
   {
-    FDPRINTF( stderr, "Warning: %u tags were unclosed.\n", (unsigned) stack.size() );
+    GD_FDPRINTF( stderr, "Warning: %u tags were unclosed.\n", (unsigned) stack.size() );
   }
 }
 
+void ArticleDom::openTag( wstring const & name,
+                          wstring const & attrs,
+                          list<Node *> &stack )
+{
+  list< Node > nodesToReopen;
+
+  if( name == GD_NATIVE_TO_WS( L"m" ) || checkM( name, GD_NATIVE_TO_WS( L"m" ) ) )
+  {
+    // All tags above [m] tag will be closed and reopened after
+    // to avoid break this tag by closing some other tag.
+
+    while( stack.size() )
+    {
+      nodesToReopen.push_back( Node( Node::Tag(), stack.back()->tagName,
+                                     stack.back()->tagAttrs ) );
+
+      if ( stack.back()->empty() )
+      {
+        // Empty nodes are deleted since they're no use
+
+        stack.pop_back();
+
+        Node * parent = stack.size() ? stack.back() : &root;
+
+        parent->pop_back();
+      }
+      else
+        stack.pop_back();
+    }
+  }
+
+  // Add tag
+
+  Node node( Node::Tag(), name, attrs );
+
+  if ( stack.empty() )
+  {
+    root.push_back( node );
+    stack.push_back( &root.back() );
+  }
+  else
+  {
+    stack.back()->push_back( node );
+    stack.push_back( &stack.back()->back() );
+  }
+
+  // Reopen tags if needed
+
+  while( nodesToReopen.size() )
+  {
+    if ( stack.empty() )
+    {
+      root.push_back( nodesToReopen.back() );
+      stack.push_back( &root.back() );
+    }
+    else
+    {
+      stack.back()->push_back( nodesToReopen.back() );
+      stack.push_back( &stack.back()->back() );
+    }
+
+    nodesToReopen.pop_back();
+  }
+
+}
+
 void ArticleDom::closeTag( wstring const & name,
                            list< Node * > & stack,
                            bool warn )
@@ -508,9 +588,9 @@
         nodesToReopen.push_back( Node( Node::Tag(), stack.back()->tagName,
                                        stack.back()->tagAttrs ) );
 
-      if ( stack.back()->empty() )
+      if ( stack.back()->empty() && stack.back()->tagName != GD_NATIVE_TO_WS( L"br" ) )
       {
-        // Empty nodes are deleted since they're no use
+        // Empty nodes except [br] tag are deleted since they're no use
 
         stack.pop_back();
 
@@ -544,8 +624,13 @@
   else
   if ( warn )
   {
-    qWarning() << "Warning: no corresponding opening tag for closing tag" <<
-                   gd::toQString( name ) << "found.";
+    if( !dictionaryName.empty() )
+      gdWarning( "Warning: no corresponding opening tag for closing tag \"%s\" found in \"%s\", article \"%s\".",
+                 gd::toQString( name ).toUtf8().data(), dictionaryName.c_str(),
+                 gd::toQString( headword ).toUtf8().data() );
+    else
+      gdWarning( "Warning: no corresponding opening tag for closing tag \"%s\" found.",
+                 gd::toQString( name ).toUtf8().data() );
   }
 }
 
@@ -712,7 +797,7 @@
       if ( !needExactEncoding )
       {
         // We don't need that!
-        FDPRINTF( stderr, "Warning: encoding was specified in a Unicode file, ignoring.\n" );
+        GD_FDPRINTF( stderr, "Warning: encoding was specified in a Unicode file, ignoring.\n" );
       }
       else
       if ( !wcscasecmp( arg.c_str(), GD_NATIVE_TO_WS( L"Latin" ) ) )
@@ -959,7 +1044,7 @@
 
       if ( refCount < 0 )
       {
-        FDPRINTF( stderr, "Warning: an unmatched closing brace was encountered.\n" );
+        GD_FDPRINTF( stderr, "Warning: an unmatched closing brace was encountered.\n" );
         refCount = 0;
         // But we remove that thing either way
         str.erase( x, 1 );
@@ -988,7 +1073,7 @@
 
   if ( strip && refCount )
   {
-    FDPRINTF( stderr, "Warning: unclosed brace(s) encountered.\n" );
+    GD_FDPRINTF( stderr, "Warning: unclosed brace(s) encountered.\n" );
     str.erase( startPos );
   }
 }
@@ -1170,6 +1255,10 @@
       }
     }
   }
+  if( !str.empty() && str[ str.size() - 1 ] == L' ' )
+    str.erase( str.size() - 1, 1 );
+  if( !str.empty() && str[ 0 ] == L' ' )
+    str.erase( 0, 1 );
 }
 
 namespace
diff -Nru goldendict-1.5.0~git20131003/dsl_details.hh goldendict-1.5.0~git20150923/dsl_details.hh
--- goldendict-1.5.0~git20131003/dsl_details.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/dsl_details.hh	2015-09-23 08:26:24.000000000 +0000
@@ -57,18 +57,21 @@
 
     /// Concatenates all childen text nodes recursively to form all text
     /// the node contains stripped of any markup.
-    wstring renderAsText() const;
+    wstring renderAsText( bool stripTrsTag = false ) const;
   };
 
   /// Does the parse at construction. Refer to the 'root' member variable
   /// afterwards.
-  ArticleDom( wstring const & );
+  ArticleDom( wstring const &, string const & dictName = string(),
+              wstring const & headword_ = wstring() );
 
   /// Root of DOM's tree
   Node root;
 
 private:
 
+  void openTag( wstring const & name, wstring const & attr, list< Node * > & stack );
+
   void closeTag( wstring const & name, list< Node * > & stack,
                  bool warn = true );
 
@@ -81,6 +84,10 @@
   unsigned transcriptionCount; // >0 = inside a [t] tag
 
   void nextChar() throw( eot );
+
+  /// Infomation for diagnostic purposes
+  string dictionaryName;
+  wstring headword;
 };
 
 /// A adapted version of Iconv which takes Dsl encoding and decodes to wchar.
diff -Nru goldendict-1.5.0~git20131003/editdictionaries.cc goldendict-1.5.0~git20150923/editdictionaries.cc
--- goldendict-1.5.0~git20131003/editdictionaries.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/editdictionaries.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,6 +4,7 @@
 #include "editdictionaries.hh"
 #include "loaddictionaries.hh"
 #include "dictinfo.hh"
+#include "mainwindow.hh"
 #include <QMessageBox>
 
 using std::vector;
@@ -23,6 +24,8 @@
   dictionariesChanged( false ),
   groupsChanged( false ),
   lastCurrentTab( 0 )
+, helpWindow( 0 )
+, helpAction( this )
 {
   // Some groups may have contained links to non-existnent dictionaries. We
   // would like to preserve them if no edits were done. To that end, we save
@@ -48,7 +51,22 @@
   connect( &sources, SIGNAL( rescan() ), this, SLOT( rescanSources() ) );
 
   connect( groups.get(), SIGNAL( showDictionaryInfo( QString const & ) ),
-           this, SIGNAL( showDictionaryInfo(QString const & ) ) );
+           this, SIGNAL( showDictionaryInfo( QString const & ) ) );
+
+  connect( orderAndProps.get(), SIGNAL( showDictionaryHeadwords( QString const & ) ),
+           this, SIGNAL( showDictionaryHeadwords( QString const & ) ) );
+
+  connect( ui.buttons, SIGNAL( helpRequested() ),
+           this, SLOT( helpRequested() ) );
+
+  helpAction.setShortcut( QKeySequence( "F1" ) );
+  helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
+
+  connect( &helpAction, SIGNAL( triggered() ),
+           this, SLOT( helpRequested() ) );
+
+  addAction( &helpAction );
+
 }
 
 void EditDictionaries::editGroup( unsigned id )
@@ -161,6 +179,7 @@
          sources.getForvo() != cfg.forvo ||
          sources.getMediaWikis() != cfg.mediawikis ||
          sources.getWebSites() != cfg.webSites ||
+         sources.getDictServers() != cfg.dictServers ||
          sources.getPrograms() != cfg.programs ||
          sources.getVoiceEngines() != cfg.voiceEngines;
 }
@@ -180,6 +199,7 @@
   cfg.forvo = sources.getForvo();
   cfg.mediawikis = sources.getMediaWikis();
   cfg.webSites = sources.getWebSites();
+  cfg.dictServers = sources.getDictServers();
   cfg.programs = sources.getPrograms();
   cfg.voiceEngines = sources.getVoiceEngines();
 
@@ -236,3 +256,38 @@
       origCfg.inactiveDictionaries = orderAndProps->getCurrentInactiveDictionaries();
   }
 }
+
+void EditDictionaries::helpRequested()
+{
+  if( !helpWindow )
+  {
+    MainWindow * mainWindow = qobject_cast< MainWindow * >( parentWidget() );
+    if( mainWindow )
+      mainWindow->closeGDHelp();
+
+    helpWindow = new Help::HelpWindow( this, cfg );
+
+    if( helpWindow )
+    {
+      helpWindow->setWindowFlags( Qt::Window );
+
+      connect( helpWindow, SIGNAL( needClose() ),
+               this, SLOT( closeHelp() ) );
+      helpWindow->showHelpFor( "Manage dictionaries" );
+      helpWindow->show();
+    }
+  }
+  else
+  {
+    if( !helpWindow->isVisible() )
+      helpWindow->show();
+
+    helpWindow->activateWindow();
+  }
+}
+
+void EditDictionaries::closeHelp()
+{
+  if( helpWindow )
+    helpWindow->hide();
+}
diff -Nru goldendict-1.5.0~git20131003/editdictionaries.hh goldendict-1.5.0~git20150923/editdictionaries.hh
--- goldendict-1.5.0~git20131003/editdictionaries.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/editdictionaries.hh	2015-09-23 08:26:24.000000000 +0000
@@ -11,7 +11,9 @@
 #include "orderandprops.hh"
 #include "groups.hh"
 #include "instances.hh"
+#include "helpwindow.hh"
 #include <QNetworkAccessManager>
+#include <QAction>
 
 class EditDictionaries: public QDialog
 {
@@ -24,6 +26,9 @@
                     Instances::Groups & groupInstances, // We only clear those on rescan
                     QNetworkAccessManager & dictNetMgr );
 
+  ~EditDictionaries()
+  { if( helpWindow ) delete helpWindow; }
+
   /// Instructs the dialog to position itself on editing the given group.
   void editGroup( unsigned id );
 
@@ -47,10 +52,15 @@
 
   void rescanSources();
 
+  void helpRequested();
+  void closeHelp();
+
 signals:
 
   void showDictionaryInfo( QString const & dictId );
 
+  void showDictionaryHeadwords( QString const & dictId );
+
 private:
 
   bool isSourcesChanged() const;
@@ -77,7 +87,10 @@
   bool dictionariesChanged;
   bool groupsChanged;
   
-  int lastCurrentTab;  
+  int lastCurrentTab;
+
+  Help::HelpWindow * helpWindow;
+  QAction helpAction;
 };
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/editdictionaries.ui goldendict-1.5.0~git20150923/editdictionaries.ui
--- goldendict-1.5.0~git20131003/editdictionaries.ui	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/editdictionaries.ui	2015-09-23 08:26:24.000000000 +0000
@@ -32,7 +32,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
diff -Nru goldendict-1.5.0~git20131003/epwing_book.cc goldendict-1.5.0~git20150923/epwing_book.cc
--- goldendict-1.5.0~git20131003/epwing_book.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/epwing_book.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,1928 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "epwing_book.hh"
+
+#include <QDir>
+#include <QTextStream>
+#include <QTextDocumentFragment>
+#include "gddebug.hh"
+#include "fsencoding.hh"
+#include "audiolink.hh"
+#include "wstring.hh"
+#include "wstring_qt.hh"
+#include "folding.hh"
+#include "epwing_charmap.hh"
+
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
+#define _FILE_OFFSET_BITS 64
+#endif
+
+#include <eb/text.h>
+#include <eb/appendix.h>
+#include <eb/error.h>
+#include <eb/binary.h>
+#include <eb/font.h>
+
+#define HitsBufferSize 512
+
+namespace Epwing {
+
+void initialize()
+{
+  eb_initialize_library();
+}
+
+void finalize()
+{
+  eb_finalize_library();
+}
+
+namespace Book {
+
+#define HookFunc(name) \
+    EB_Error_Code name(EB_Book *, EB_Appendix *, void*, EB_Hook_Code, int, \
+                       const unsigned int*)
+
+HookFunc( hook_newline );
+HookFunc( hook_iso8859_1 );
+HookFunc( hook_narrow_jisx0208 );
+HookFunc( hook_wide_jisx0208 );
+HookFunc( hook_gb2312 );
+HookFunc( hook_superscript );
+HookFunc( hook_subscript );
+HookFunc( hook_decoration );
+HookFunc( hook_color_image );
+HookFunc( hook_gray_image );
+HookFunc( hook_mono_image );
+HookFunc( hook_wave );
+HookFunc( hook_mpeg );
+HookFunc( hook_narrow_font );
+HookFunc( hook_wide_font );
+HookFunc( hook_reference );
+
+const EB_Hook hooks[] = {
+  { EB_HOOK_NEWLINE, hook_newline },
+  { EB_HOOK_ISO8859_1, hook_iso8859_1 },
+  { EB_HOOK_NARROW_JISX0208, hook_narrow_jisx0208 },
+  { EB_HOOK_WIDE_JISX0208, hook_wide_jisx0208 },
+  { EB_HOOK_GB2312, hook_gb2312 },
+  { EB_HOOK_BEGIN_SUBSCRIPT, hook_subscript },
+  { EB_HOOK_END_SUBSCRIPT, hook_subscript },
+  { EB_HOOK_BEGIN_SUPERSCRIPT, hook_superscript },
+  { EB_HOOK_END_SUPERSCRIPT, hook_superscript },
+  { EB_HOOK_BEGIN_DECORATION, hook_decoration },
+  { EB_HOOK_END_DECORATION, hook_decoration },
+  { EB_HOOK_BEGIN_COLOR_BMP, hook_color_image },
+  { EB_HOOK_BEGIN_COLOR_JPEG, hook_color_image },
+  { EB_HOOK_END_COLOR_GRAPHIC, hook_color_image },
+  { EB_HOOK_BEGIN_IN_COLOR_BMP, hook_color_image },
+  { EB_HOOK_BEGIN_IN_COLOR_JPEG, hook_color_image },
+  { EB_HOOK_END_IN_COLOR_GRAPHIC, hook_color_image },
+  { EB_HOOK_BEGIN_MONO_GRAPHIC, hook_mono_image },
+  { EB_HOOK_END_MONO_GRAPHIC, hook_mono_image },
+  { EB_HOOK_BEGIN_WAVE, hook_wave },
+  { EB_HOOK_END_WAVE, hook_wave },
+  { EB_HOOK_BEGIN_MPEG, hook_mpeg },
+  { EB_HOOK_END_MPEG, hook_mpeg },
+  { EB_HOOK_NARROW_FONT, hook_narrow_font },
+  { EB_HOOK_WIDE_FONT, hook_wide_font },
+  { EB_HOOK_BEGIN_REFERENCE, hook_reference },
+  { EB_HOOK_END_REFERENCE, hook_reference },
+  { EB_HOOK_NULL, NULL }
+};
+
+const EB_Hook refHooks[] = {
+  { EB_HOOK_BEGIN_REFERENCE, hook_reference },
+  { EB_HOOK_END_REFERENCE, hook_reference },
+  { EB_HOOK_NULL, NULL }
+};
+
+#define EUC_TO_ASCII_TABLE_START	0xa0
+#define EUC_TO_ASCII_TABLE_END		0xff
+
+// Tables from EB library
+
+static const unsigned char euc_a1_to_ascii_table[] = {
+    0x00, 0x20, 0x00, 0x00, 0x2c, 0x2e, 0x00, 0x3a,     /* 0xa0 */
+    0x3b, 0x3f, 0x21, 0x00, 0x00, 0x00, 0x60, 0x00,     /* 0xa8 */
+    0x5e, 0x7e, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xb0 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x2f,     /* 0xb8 */
+    0x5c, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x27,     /* 0xc0 */
+    0x00, 0x22, 0x28, 0x29, 0x00, 0x00, 0x5b, 0x5d,     /* 0xc8 */
+    0x7b, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xd0 */
+    0x00, 0x00, 0x00, 0x00, 0x2b, 0x2d, 0x00, 0x00,     /* 0xd8 */
+    0x00, 0x3d, 0x00, 0x3c, 0x3e, 0x00, 0x00, 0x00,     /* 0xe0 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c,     /* 0xe8 */
+    0x24, 0x00, 0x00, 0x25, 0x23, 0x26, 0x2a, 0x40,     /* 0xf0 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xf8 */
+};
+
+static const unsigned char euc_a3_to_ascii_table[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xa0 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xa8 */
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,     /* 0xb0 */
+    0x38, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xb8 */
+    0x00, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,     /* 0xc0 */
+    0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,     /* 0xc8 */
+    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,     /* 0xd0 */
+    0x58, 0x59, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xd8 */
+    0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,     /* 0xe0 */
+    0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,     /* 0xe8 */
+    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,     /* 0xf0 */
+    0x78, 0x79, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0xf8 */
+};
+
+// Hook functions
+
+EB_Error_Code hook_newline( EB_Book * book, EB_Appendix *, void * ptr,
+                            EB_Hook_Code, int, const unsigned int * )
+{
+  EContainer * container = static_cast< EContainer * >( ptr );
+
+  if( container->textOnly )
+    eb_write_text_byte1( book,  '\n' );
+  else
+    eb_write_text_string( book, "<br>" );
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_iso8859_1( EB_Book * book, EB_Appendix *, void * container,
+                              EB_Hook_Code, int, const unsigned int * argv )
+{
+  EpwingBook * ebook = static_cast< EpwingBook * >( container );
+  if( ebook->codecISO() )
+  {
+    QByteArray b = ebook->codecISO()->toUnicode( (const char *)argv, 1 ).toUtf8();
+    eb_write_text( book, b.data(), b.size() );
+  }
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_narrow_jisx0208( EB_Book * book, EB_Appendix *,
+                                    void * container, EB_Hook_Code, int,
+                                    const unsigned int * argv )
+{
+  if( *argv == 0xA1E3 )
+    eb_write_text_string( book, "&lt;" );
+  else
+  if( *argv == 0xA1E4 )
+    eb_write_text_string( book, "&gt;" );
+  else
+  if( *argv == 0xA1F5 )
+    eb_write_text_string( book, "&amp;" );
+  else
+  {
+    unsigned char buf[ 2 ];
+    buf[ 0 ] = argv[ 0 ] >> 8;
+    buf[ 1 ] = argv[ 0 ] & 0xff;
+    int out_code = 0;
+
+    if( buf[ 0 ] == 0xA1 && buf[ 1 ] >= EUC_TO_ASCII_TABLE_START )
+      out_code = euc_a1_to_ascii_table[ buf[ 1 ] - EUC_TO_ASCII_TABLE_START ];
+    else
+    if( buf[ 0 ] == 0xA3 && buf[ 1 ] >= EUC_TO_ASCII_TABLE_START )
+      out_code = euc_a3_to_ascii_table[ buf[ 1 ] - EUC_TO_ASCII_TABLE_START ];
+
+    if( out_code == 0 )
+    {
+      EContainer * cont = static_cast< EContainer * >( container );
+      if( cont->book->codecEuc() )
+      {
+        QByteArray str = cont->book->codecEuc()->toUnicode( (const char *)buf, 2 ).toUtf8();
+        eb_write_text( book, str.data(), str.size() );
+      }
+      else
+        eb_write_text( book, (const char *)buf, 2 );
+    }
+    else
+      eb_write_text_byte1( book, out_code );
+  }
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_wide_jisx0208( EB_Book * book, EB_Appendix *, void * ptr,
+                                  EB_Hook_Code, int, const unsigned int * argv )
+{
+  EpwingBook * ebook = static_cast< EContainer * >( ptr )->book;
+
+  char buf[2];
+  buf[1] = *argv & 0xFF;
+  buf[0] = ( *argv & 0xFF00 ) >> 8;
+
+  if( ebook->codecEuc() )
+  {
+    QByteArray b = ebook->codecEuc()->toUnicode( buf, 2 ).toUtf8();
+    eb_write_text( book, b.data(), b.size() );
+  }
+  else
+    eb_write_text_byte2( book, buf[ 0 ], buf[ 1 ] );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_gb2312( EB_Book * book, EB_Appendix *, void * container,
+                           EB_Hook_Code, int, const unsigned int * argv )
+{
+  EpwingBook * ebook = static_cast< EContainer * >( container )->book;
+
+  char buf[2];
+  buf[1] = *argv & 0xFF;
+  buf[0] = ( *argv & 0xFF00 ) >> 8 ;
+
+  if( ebook->codecGB() )
+  {
+    QByteArray b = ebook->codecGB()->toUnicode( buf, 2 ).toUtf8();
+    eb_write_text( book, b.data(), b.size() );
+  }
+  else
+    eb_write_text_byte2( book, buf[ 0 ], buf[ 1 ] );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_subscript( EB_Book * book, EB_Appendix *, void * container,
+                              EB_Hook_Code code, int, const unsigned int * )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  if( code == EB_HOOK_BEGIN_SUBSCRIPT )
+    eb_write_text_string( book, cn->book->beginDecoration( EpwingBook::SUBSCRIPT ) );
+
+  if( code == EB_HOOK_END_SUBSCRIPT )
+    eb_write_text_string( book, cn->book->endDecoration( EpwingBook::SUBSCRIPT ) );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_superscript( EB_Book * book, EB_Appendix *, void * container,
+                                EB_Hook_Code code, int, const unsigned int * )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  if( code == EB_HOOK_BEGIN_SUPERSCRIPT )
+    eb_write_text_string( book, cn->book->beginDecoration( EpwingBook::SUPERSCRIPT ) );
+
+  if( code == EB_HOOK_END_SUPERSCRIPT )
+    eb_write_text_string( book, cn->book->endDecoration( EpwingBook::SUPERSCRIPT ) );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_decoration( EB_Book * book, EB_Appendix *, void * container,
+                               EB_Hook_Code code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  if( code == EB_HOOK_BEGIN_DECORATION )
+    eb_write_text_string( book, cn->book->beginDecoration( argv[ 1 ] ) );
+
+  if( code == EB_HOOK_END_DECORATION )
+    eb_write_text_string( book, cn->book->endDecoration( argv[ 1 ] ) );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_color_image( EB_Book * book, EB_Appendix *, void * container,
+                                EB_Hook_Code code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  QByteArray str = cn->book->handleColorImage( code, argv );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_mono_image( EB_Book * book, EB_Appendix *, void * container,
+                               EB_Hook_Code code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  QByteArray str = cn->book->handleMonoImage( code, argv );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_wave( EB_Book * book, EB_Appendix *, void * container,
+                         EB_Hook_Code code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  QByteArray str = cn->book->handleWave( code, argv );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_mpeg( EB_Book * book, EB_Appendix *, void * container,
+                         EB_Hook_Code code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  QByteArray str = cn->book->handleMpeg( code, argv );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_narrow_font( EB_Book * book, EB_Appendix *, void * container,
+                                EB_Hook_Code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  QByteArray str = cn->book->handleNarrowFont( argv, cn->textOnly );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_wide_font( EB_Book * book, EB_Appendix *, void * container,
+                              EB_Hook_Code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  QByteArray str = cn->book->handleWideFont( argv, cn->textOnly );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+EB_Error_Code hook_reference( EB_Book * book, EB_Appendix *, void * container,
+                              EB_Hook_Code code, int, const unsigned int * argv )
+{
+  EContainer * cn = static_cast< EContainer * >( container );
+
+  if( cn->textOnly )
+    return EB_SUCCESS;
+
+  QByteArray str = cn->book->handleReference( code, argv );
+  if( !str.isEmpty() )
+    eb_write_text( book, str.data(), str.size() );
+
+  return EB_SUCCESS;
+}
+
+// EpwingBook class
+
+EpwingBook::EpwingBook() :
+  currentSubBook( -1 )
+{
+  codec_ISO = QTextCodec::codecForName( "ISO8859-1" );
+  codec_GB = QTextCodec::codecForName( "GB2312" );
+  codec_Euc = QTextCodec::codecForName("EUC-JP");
+
+  eb_initialize_book( &book );
+  eb_initialize_appendix( &appendix );
+
+  eb_initialize_hookset( &hookSet );
+  eb_set_hooks( &hookSet, hooks );
+
+  eb_initialize_hookset( &refHookSet );
+  eb_set_hooks( &refHookSet, refHooks );
+}
+
+EpwingBook::~EpwingBook()
+{
+  eb_finalize_hookset( &hookSet );
+  eb_finalize_appendix( &appendix );
+  eb_finalize_book( &book );
+}
+
+void EpwingBook::setErrorString( QString const & func, EB_Error_Code code )
+{
+  error_string = QString( "EB \"%1\" function error: %2 (%3)" )
+                 .arg( func )
+                 .arg( QTextCodec::codecForLocale()->toUnicode( eb_error_string( code ) ) )
+                 .arg( QTextCodec::codecForLocale()->toUnicode( eb_error_message( code ) ) );
+
+  if( currentPosition.page != 0 )
+    error_string += QString( " on page %1, offset %2" ).arg( QString::number( currentPosition.page ) )
+                                                       .arg( QString::number( currentPosition.offset ) );
+}
+
+void EpwingBook::collectFilenames( QString const & directory, vector< string > & files )
+{
+  QDir dir( directory );
+  QString catName;
+  catName += QDir::separator();
+  catName += "catalogs";
+
+  QFileInfoList entries = dir.entryInfoList( QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot,
+                                             QDir::Name | QDir::DirsLast );
+
+  for( QFileInfoList::const_iterator i = entries.constBegin();
+       i != entries.constEnd(); ++i )
+  {
+    QString fullName = QDir::toNativeSeparators( i->filePath() );
+
+    if( i->isDir() )
+      collectFilenames( fullName, files );
+    else
+      files.push_back( FsEncoding::encode( fullName ) );
+  }
+}
+
+int EpwingBook::setBook( string const & directory )
+{
+  error_string.clear();
+
+  if( directory.empty() )
+    throw exEpwing( "No such directory" );
+
+  currentPosition.page = 0;
+
+  indexHeadwordsPosition.page = 0;
+  indexHeadwordsPosition.offset = 0;
+
+  currentSubBook = -1;
+
+  EB_Error_Code ret = eb_bind( &book, directory.c_str() );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_bind", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+    return -1;
+  }
+
+  ret = eb_bind_appendix( &appendix, directory.c_str() );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_bind_appendix", ret );
+  }
+
+  ret = eb_subbook_list( &book, subBookList, &subBookCount );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_subbook_list", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  ret = eb_appendix_subbook_list( &appendix, subAppendixList, &subAppendixCount );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_appendix_subbook_list", ret );
+  }
+
+  if( !codec_Euc
+      || ( book.character_code == EB_CHARCODE_ISO8859_1 && !codec_ISO )
+      || ( book.character_code == EB_CHARCODE_JISX0208_GB2312 && !codec_GB ) )
+    throw exEpwing( "No required codec to decode dictionary" );
+
+  rootDir = FsEncoding::decode( directory.c_str() );
+
+  return subBookCount;
+}
+
+bool EpwingBook::setSubBook( int book_nom )
+{
+  error_string.clear();
+
+  customFontsMap.clear();
+
+  currentPosition.page = 0;
+
+  if( book_nom < 0 || book_nom >= subBookCount )
+    throw exEpwing( "Invalid subbook number" );
+
+  if( currentSubBook == book_nom )
+    return true;
+
+  EB_Error_Code ret = eb_set_subbook( &book, subBookList[ book_nom ] );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_set_subbook", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+  currentSubBook = book_nom;
+
+  if( book_nom < subAppendixCount )
+  {
+    ret = eb_set_appendix_subbook( &appendix, subAppendixList[ book_nom ] );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_set_appendix_subbook", ret );
+    }
+  }
+
+  if( eb_have_font( &book, EB_FONT_16 ) )
+  {
+    ret = eb_set_font( &book, EB_FONT_16 );
+    if( ret != EB_SUCCESS )
+      setErrorString( "eb_set_font", ret );
+  }
+
+  // Load fonts list
+
+  QString fileName = rootDir + QDir::separator()
+                     + "afonts_" + QString::number( book_nom );
+
+  QFile f( fileName );
+  if( f.open( QFile::ReadOnly | QFile::Text ) )
+  {
+    QTextStream ts( &f );
+    ts.setCodec( "UTF-8" );
+
+    QString line = ts.readLine();
+    while( !line.isEmpty() )
+    {
+      QStringList list = line.remove( '\n' ).split( ' ', QString::SkipEmptyParts );
+      if( list.count() == 2 )
+        customFontsMap[ list[ 0 ] ] = list[ 1 ];
+      line = ts.readLine();
+    }
+
+    f.close();
+  }
+
+  return true;
+}
+
+void EpwingBook::setCacheDirectory( QString const & cacheDir )
+{
+  mainCacheDir = cacheDir;
+  cacheImagesDir.clear();
+  cacheSoundsDir.clear();
+  cacheMoviesDir.clear();
+  cacheFontsDir.clear();
+
+  imageCacheList.clear();
+  soundsCacheList.clear();
+  moviesCacheList.clear();
+  fontsCacheList.clear();
+}
+
+QString EpwingBook::createCacheDir( QString const & dirName )
+{
+  QDir dir;
+  QFileInfo info( mainCacheDir );
+  if( !info.exists() || !info.isDir() )
+  {
+    if( !dir.mkdir( mainCacheDir ) )
+    {
+      gdWarning( "Epwing: can't create cache directory \"%s\"", mainCacheDir.toUtf8().data() );
+      return QString();
+    }
+  }
+
+  QString cacheDir = mainCacheDir + QDir::separator() + dirName;
+  info = QFileInfo( cacheDir );
+  if( !info.exists() || !info.isDir() )
+  {
+    if( !dir.mkdir( cacheDir ) )
+    {
+      gdWarning( "Epwing: can't create cache directory \"%s\"", cacheDir.toUtf8().data() );
+      return QString();
+    }
+  }
+  return cacheDir;
+}
+
+QString EpwingBook::getCurrentSubBookDirectory()
+{
+  error_string.clear();
+
+  if( currentSubBook < 0 || currentSubBook >= subBookCount )
+  {
+    setErrorString( "eb_subbook_directory2", EB_ERR_NO_SUCH_BOOK );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  char buffer[ EB_MAX_PATH_LENGTH + 1 ];
+
+  EB_Error_Code ret = eb_subbook_directory2( &book, subBookList[ currentSubBook ], buffer );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_subbook_directory2", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  return QString::fromLocal8Bit( buffer );
+}
+
+QString EpwingBook::makeFName( QString const & ext, int page, int offset ) const
+{
+  QString name = QString::number( page )
+                 + "x"
+                 + QString::number( offset )
+                 + "."
+                 + ext;
+  return name;
+}
+
+QString EpwingBook::title()
+{
+  char buf[ EB_MAX_TITLE_LENGTH + 1 ];
+  error_string.clear();
+
+  EB_Error_Code ret = eb_subbook_title( &book, buf );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_subbook_title", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  buf[ EB_MAX_TITLE_LENGTH ] = 0;
+  if( codec_Euc )
+    return codec_Euc->toUnicode( buf );
+
+  return QString();
+}
+
+QString EpwingBook::copyright()
+{
+  error_string.clear();
+
+  if( !eb_have_copyright( &book ) )
+    return QString();
+
+  EB_Position position;
+  EB_Error_Code ret = eb_copyright( &book, &position );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_copyright", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  currentPosition = position;
+
+  return getText( position.page, position.offset, true );
+}
+
+QString EpwingBook::getText( int page, int offset, bool text_only )
+{
+  error_string.clear();
+
+  EB_Position pos;
+  pos.page = page;
+  pos.offset = offset;
+  currentPosition = pos;
+
+  EB_Error_Code ret = eb_seek_text(&book, &pos);
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_seek_text", ret );
+    currentPosition.page = 0;
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  QByteArray buf;
+  char buffer[ TextBufferSize + 1 ];
+  ssize_t buffer_length;
+
+  EContainer container( this, text_only );
+
+  prepareToRead();
+
+  for( ; ; )
+  {
+    ret = eb_read_text( &book, &appendix, &hookSet, &container,
+                        TextBufferSize, buffer, &buffer_length );
+
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_read_text", ret );
+      break;
+    }
+
+    buf += QByteArray( buffer, buffer_length );
+
+    if( eb_is_text_stopped( &book ) )
+      break;
+
+    if( buf.length() > TextSizeLimit )
+    {
+      error_string = "Data too large";
+      currentPosition.page = 0;
+      return QString();
+    }
+  }
+
+  QString text = QString::fromUtf8( buf.data(), buf.size() ).trimmed();
+  finalizeText( text );
+  return text;
+}
+
+void EpwingBook::getReferencesFromText( int page, int offset )
+{
+  error_string.clear();
+
+  EB_Position pos;
+  pos.page = page;
+  pos.offset = offset;
+
+  currentPosition = pos;
+
+  EB_Error_Code ret = eb_seek_text(&book, &pos);
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_seek_text", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  char buffer[ TextBufferSize + 1 ];
+  ssize_t buffer_length;
+
+  EContainer container( this, false );
+
+  prepareToRead();
+
+  for( ; ; )
+  {
+    ret = eb_read_text( &book, &appendix, &refHookSet, &container,
+                        TextBufferSize, buffer, &buffer_length );
+
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_read_text", ret );
+      break;
+    }
+
+    if( eb_is_text_stopped( &book ) )
+      break;
+  }
+
+  for( int x = 0; x < refPages.size(); x++ )
+    LinksQueue.push_back( EWPos( refPages[ x ], refOffsets[ x ] ) );
+}
+
+EB_Error_Code EpwingBook::forwardText( EB_Position & startPos )
+{
+  EB_Error_Code ret = eb_seek_text( &book, &startPos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_seek_text", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  ret = eb_forward_text( &book, &appendix );
+  while( ret == EB_ERR_END_OF_CONTENT )
+  {
+    ret = eb_tell_text( &book, &startPos );
+    if( ret != EB_SUCCESS )
+      break;
+
+    if( startPos.page >= book.subbook_current->text.end_page )
+      return EB_ERR_END_OF_CONTENT;
+
+    startPos.offset += 2;
+    currentPosition = startPos;
+
+    ret = eb_seek_text( &book, &startPos );
+
+    if( ret == EB_SUCCESS )
+      ret = eb_forward_text( &book, &appendix );
+  }
+  return ret;
+}
+
+void EpwingBook::getFirstHeadword( EpwingHeadword & head )
+{
+  error_string.clear();
+
+  EB_Position pos;
+
+  EB_Error_Code ret = eb_text( &book, &pos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_text", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  ret = forwardText( pos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "forwardText", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  eb_backward_text( &book, &appendix );
+
+  ret = eb_tell_text( &book, &pos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_tell_text", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  currentPosition = pos;
+  indexHeadwordsPosition = pos;
+
+  head.page = pos.page;
+  head.offset = pos.offset;
+
+  if( !readHeadword( pos, head.headword, true ) )
+    throw exEbLibrary( error_string.toUtf8().data() );
+
+  fixHeadword( head.headword );
+
+  EWPos epos( pos.page, pos.offset );
+  allHeadwordPositions[ head.headword ] = epos;
+}
+
+bool EpwingBook::getNextHeadword( EpwingHeadword & head )
+{
+  EB_Position pos;
+
+  QRegExp badLinks( "#(v|n)\\d" );
+
+  // At first we check references queue
+  while( !LinksQueue.isEmpty() )
+  {
+    EWPos epos = LinksQueue.last();
+    LinksQueue.pop_back();
+
+    pos.page = epos.first;
+    pos.offset = epos.second;
+
+    if( readHeadword( pos, head.headword, true ) )
+    {
+      if( head.headword.isEmpty()
+          || head.headword.contains( badLinks ) )
+        continue;
+
+      fixHeadword( head.headword );
+
+      head.page = pos.page;
+      head.offset = pos.offset;
+
+      if( allHeadwordPositions.contains( head.headword ) )
+      {
+        EWPos epos = allHeadwordPositions[ head.headword ];
+        if( pos.page != epos.first || abs( pos.offset - epos.second ) > 4 )
+          return true;
+      }
+      else
+      {
+        allHeadwordPositions[ head.headword ] = EWPos( pos.page, pos.offset );
+        return true;
+      }
+    }
+  }
+
+  // No queued positions - forward to next article
+
+  error_string.clear();
+
+  pos = indexHeadwordsPosition;
+
+  for( ; ; )
+  {
+    EB_Error_Code ret = forwardText( pos );
+    indexHeadwordsPosition = pos;
+
+    if( ret == EB_ERR_END_OF_CONTENT )
+      return false;
+    else
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_forward_text", ret );
+      throw exEbLibrary( error_string.toUtf8().data() );
+    }
+
+    ret = eb_tell_text( &book, &pos );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_tell_text", ret );
+      throw exEbLibrary( error_string.toUtf8().data() );
+    }
+
+    indexHeadwordsPosition = pos;
+
+    try
+    {
+      getReferencesFromText( pos.page, pos.offset );
+    }
+    catch( std::exception )
+    {
+    }
+
+    head.page = pos.page;
+    head.offset = pos.offset;
+
+    if( !readHeadword( pos, head.headword, true ) )
+      throw exEbLibrary( error_string.toUtf8().data() );
+
+    if( head.headword.isEmpty() )
+      continue;
+
+    fixHeadword( head.headword );
+
+    if( allHeadwordPositions.contains( head.headword ) )
+    {
+      EWPos epos = allHeadwordPositions[ head.headword ];
+      if( pos.page != epos.first || abs( pos.offset - epos.second ) > 4 )
+        break;
+    }
+    else
+    {
+      allHeadwordPositions[ head.headword ] = EWPos( pos.page, pos.offset );
+      break;
+    }
+  }
+
+  return true;
+}
+
+bool EpwingBook::readHeadword( EB_Position const& pos,
+                               QString & headword,
+                               bool text_only )
+{
+  EContainer container( this, text_only );
+  ssize_t head_length;
+
+  EB_Position newPos = pos;
+
+  EB_Error_Code ret = eb_seek_text( &book, &newPos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_seek_text", ret );
+    return false;
+  }
+
+  char buffer[ TextBufferSize + 1 ];
+
+  ret = eb_read_heading( &book, &appendix, &hookSet, &container,
+                         TextBufferSize, buffer, &head_length );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_read_heading", ret );
+    return false;
+  }
+
+  headword = QString::fromUtf8( buffer, head_length );
+  return true;
+}
+
+bool EpwingBook::isHeadwordCorrect( QString const & headword )
+{
+  QByteArray buf, buf2;
+  EB_Hit hits[ 2 ];
+  int hit_count;
+  EB_Error_Code ret;
+
+  if( headword.isEmpty() )
+    return false;
+
+  if( book.character_code == EB_CHARCODE_ISO8859_1 && codec_ISO )
+    buf = codec_ISO->fromUnicode( headword );
+  else
+  if( ( book.character_code == EB_CHARCODE_JISX0208 || book.character_code == EB_CHARCODE_JISX0208_GB2312 )
+      && codec_Euc )
+    buf = codec_Euc->fromUnicode( headword );
+
+  if( book.character_code == EB_CHARCODE_JISX0208_GB2312 && codec_GB )
+    buf2 = codec_GB->fromUnicode( headword );
+
+  if( !buf.isEmpty() && eb_search_exactword( &book, buf.data() ) == EB_SUCCESS )
+  {
+    ret = eb_hit_list( &book, 2, hits, &hit_count );
+    if( ret == EB_SUCCESS && hit_count > 0 )
+      return true;
+  }
+
+  if( !buf2.isEmpty() && eb_search_exactword( &book, buf2.data() ) == EB_SUCCESS )
+  {
+    ret = eb_hit_list( &book, 2, hits, &hit_count );
+    if( ret == EB_SUCCESS && hit_count > 0 )
+      return true;
+  }
+
+  return false;
+}
+
+void EpwingBook::fixHeadword( QString & headword )
+{
+  if(headword.isEmpty() )
+    return;
+
+  headword.remove( QChar( 0x30FB ) ); // Used in Japan transcription
+
+  if( isHeadwordCorrect( headword) )
+    return;
+
+  QString fixed = headword;
+  fixed.remove( QRegExp( "/[^/]+/", Qt::CaseSensitive ) );
+
+  if( isHeadwordCorrect( fixed ) )
+  {
+    headword = fixed;
+    return;
+  }
+
+  gd::wstring folded = Folding::applyPunctOnly( gd::toWString( fixed ) );
+  fixed = gd::toQString( folded );
+
+  if( isHeadwordCorrect( fixed ) )
+  {
+    headword = fixed;
+    return;
+  }
+
+  folded = Folding::applyDiacriticsOnly( folded );
+  fixed = gd::toQString( folded );
+
+  if( isHeadwordCorrect( fixed ) )
+  {
+    headword = fixed;
+    return;
+  }
+
+  folded = Folding::applyWhitespaceOnly( folded );
+  fixed = gd::toQString( folded );
+
+  if( isHeadwordCorrect( fixed ) )
+    headword = fixed;
+}
+
+void EpwingBook::getArticle( QString & headword, QString & articleText,
+                             int page, int offset, bool text_only)
+{
+  error_string.clear();
+  char buffer[ TextBufferSize + 1 ];
+
+  EB_Position pos;
+  pos.page = page;
+  pos.offset = offset;
+
+  currentPosition = pos;
+
+  EB_Error_Code ret = eb_seek_text( &book, &pos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_seek_text", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  EContainer container( this, text_only );
+  ssize_t length;
+
+  prepareToRead();
+
+  ret = eb_read_heading( &book, &appendix, &hookSet, &container,
+                         TextBufferSize, buffer, &length );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_read_heading", ret );
+    throw exEbLibrary( error_string.toUtf8().data() );
+  }
+
+  headword = QString::fromUtf8( buffer, length );
+  finalizeText( headword );
+
+  articleText = getText( pos.page, pos.offset, text_only );
+}
+
+const char * EpwingBook::beginDecoration( unsigned int code )
+{
+  const char * str = "";
+
+  code = normalizeDecorationCode( code );
+
+  switch( code )
+  {
+    case ITALIC:      str = "<i>";
+                      break;
+    case BOLD:        str = "<b>";
+                      break;
+    case EMPHASIS:    str = "<em>";
+                      break;
+    case SUBSCRIPT:   str = "<sub>";
+                      break;
+    case SUPERSCRIPT: str = "<sup>";
+                      break;
+    default:          gdWarning( "Epwing: Unknown decoration code %i", code );
+                      code = UNKNOWN;
+                      break;
+  }
+  decorationStack.push( code );
+  return str;
+}
+
+const char * EpwingBook::endDecoration( unsigned int code )
+{
+  const char * str = "";
+
+  code = normalizeDecorationCode( code );
+
+  if( code != ITALIC && code != BOLD && code != EMPHASIS
+      && code != SUBSCRIPT && code != SUPERSCRIPT )
+    code = UNKNOWN;
+
+  unsigned int storedCode = UNKNOWN;
+  if( !decorationStack.isEmpty() )
+    storedCode = decorationStack.pop();
+
+  if( storedCode != code )
+  {
+    gdWarning( "Epwing: tags mismatch detected" );
+    if( storedCode == UNKNOWN )
+      storedCode = code;
+  }
+
+  switch( storedCode )
+  {
+    case ITALIC:      str = "</i>";
+                      break;
+    case BOLD:        str = "</b>";
+                      break;
+    case EMPHASIS:    str = "</em>";
+                      break;
+    case SUBSCRIPT:   str = "</sub>";
+                      break;
+    case SUPERSCRIPT: str = "</sup>";
+                      break;
+    case UNKNOWN:     break;
+  }
+
+  return str;
+}
+
+unsigned int EpwingBook::normalizeDecorationCode( unsigned int code )
+{
+  // Some non-standard codes
+  switch( code )
+  {
+    case 0x1101: return BOLD;
+    case 0x1103: return ITALIC;
+  }
+  return code;
+}
+
+void EpwingBook::finalizeText( QString & text )
+{
+  // Close unclosed tags
+  while( !decorationStack.isEmpty() )
+  {
+    unsigned int code = decorationStack.pop();
+    switch( code )
+    {
+      case ITALIC:      text += "</i>";
+                        break;
+      case BOLD:        text += "</b>";
+                        break;
+      case EMPHASIS:    text += "</em>";
+                        break;
+      case SUBSCRIPT:   text += "</sub>";
+                        break;
+      case SUPERSCRIPT: text += "</sup>";
+                        break;
+    }
+  }
+
+  // Replace references
+
+  int pos = 0;
+  QRegExp reg1( "<R[^<]*>" );
+  QRegExp reg2( "</R[^<]*>" );
+
+  EContainer cont( this, true );
+
+  char buf[ TextBufferSize + 1 ];
+
+  for( int x = 0; x < refCloseCount; x++ )
+  {
+    pos = text.indexOf( reg1, pos );
+    if( pos < 0 )
+      break;
+
+    EB_Position ebpos;
+    ebpos.page = refPages[ x ];
+    ebpos.offset = refOffsets[ x ];
+
+    QUrl url;
+    url.setScheme( "gdlookup" );
+    url.setHost( "localhost" );
+
+    // Read headword
+
+    eb_seek_text( &book, &ebpos );
+
+    ssize_t length;
+    EB_Error_Code ret = eb_read_heading( &book, &appendix, &hookSet, &cont,
+                                         TextBufferSize, buf, &length );
+    if( ret == EB_SUCCESS )
+    {
+      QString headword = QString::fromUtf8( buf, length );
+      fixHeadword( headword );
+      url.setPath( headword );
+    }
+
+    QString link = "<a href=\"" + url.toEncoded() + "\">";
+
+    text.replace( reg1.cap(), link );
+
+    pos = text.indexOf( reg2, pos );
+    if( pos < 0 )
+      break;
+
+    text.replace( reg2.cap(), "</a>" );
+  }
+}
+
+void EpwingBook::prepareToRead()
+{
+  refPages.clear();
+  refOffsets.clear();
+  refOpenCount = refCloseCount = 0;
+}
+
+QByteArray EpwingBook::handleColorImage( EB_Hook_Code code,
+                                         const unsigned int * argv )
+{
+  QString name, fullName;
+  EB_Position pos;
+
+  if( code == EB_HOOK_END_COLOR_GRAPHIC
+      || code == EB_HOOK_END_IN_COLOR_GRAPHIC )
+    return QByteArray();
+
+  pos.page = argv[ 2 ];
+  pos.offset = argv[ 3 ];
+
+  EB_Error_Code ret = eb_set_binary_color_graphic( &book, & pos );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_set_binary_color_graphic", ret );
+    gdWarning( "Epwing image retrieve error: %s",
+               error_string.toUtf8().data() );
+    return QByteArray();
+  }
+
+  if( cacheImagesDir.isEmpty() )
+    cacheImagesDir = createCacheDir( "images" );
+
+  if( code == EB_HOOK_BEGIN_COLOR_BMP
+      || code == EB_HOOK_BEGIN_IN_COLOR_BMP )
+    name = makeFName( "bmp", pos.page, pos.offset );
+  else
+  if( code == EB_HOOK_BEGIN_COLOR_JPEG
+      || code == EB_HOOK_BEGIN_IN_COLOR_JPEG )
+    name = makeFName( "jpg", pos.page, pos.offset );
+
+  if( !cacheImagesDir.isEmpty() )
+    fullName = cacheImagesDir + QDir::separator() + name;
+
+  QUrl url;
+  url.setScheme( "bres" );
+  url.setHost( dictID );
+  url.setPath( name );
+  QByteArray urlStr = "<p class=\"epwing_image\"><img src=\"" + url.toEncoded()
+                      + "\" alt=\"" + name.toUtf8() + "\"></p>";
+
+  if( imageCacheList.contains( name, Qt::CaseSensitive ) )
+  {
+    // We already have this image in cache
+    return urlStr;
+  }
+
+  if( !fullName.isEmpty() )
+  {
+    QFile f( fullName );
+    if( f.open( QFile::WriteOnly ) )
+    {
+      QByteArray buffer;
+      buffer.resize( BinaryBufferSize );
+      ssize_t length;
+
+      for( ; ; )
+      {
+        ret = eb_read_binary( &book, BinaryBufferSize,
+                              buffer.data(), &length );
+        if( ret != EB_SUCCESS )
+        {
+          setErrorString( "eb_read_binary", ret );
+          gdWarning( "Epwing image retrieve error: %s",
+                     error_string.toUtf8().data() );
+          break;
+        }
+
+        f.write( buffer.data(), length );
+
+        if( length < BinaryBufferSize )
+          break;
+      }
+      f.close();
+
+      imageCacheList.append( name );
+    }
+  }
+
+  return urlStr;
+}
+
+QByteArray EpwingBook::handleMonoImage( EB_Hook_Code code,
+                                        const unsigned int * argv )
+{
+  QString name, fullName;
+  EB_Position pos;
+
+  if( code == EB_HOOK_BEGIN_MONO_GRAPHIC )
+  {
+    monoHeight = argv[ 2 ];
+    monoWidth = argv[ 3 ];
+    return QByteArray();
+  }
+
+  // Handle EB_HOOK_END_MONO_GRAPHIC hook
+
+  pos.page = argv[ 1 ];
+  pos.offset = argv[ 2 ];
+
+  EB_Error_Code ret = eb_set_binary_mono_graphic( &book, &pos, monoWidth, monoHeight );
+  if( ret != EB_SUCCESS )
+  {
+    setErrorString( "eb_set_binary_mono_graphic", ret );
+    gdWarning( "Epwing image retrieve error: %s",
+               error_string.toUtf8().data() );
+    return QByteArray();
+  }
+
+  if( cacheImagesDir.isEmpty() )
+    cacheImagesDir = createCacheDir( "images" );
+
+  name = makeFName( "bmp", pos.page, pos.offset );
+
+  if( !cacheImagesDir.isEmpty() )
+    fullName = cacheImagesDir + QDir::separator() + name;
+
+  QUrl url;
+  url.setScheme( "bres" );
+  url.setHost( dictID );
+  url.setPath( name );
+  QByteArray urlStr = "<span class=\"epwing_image\"><img src=\"" + url.toEncoded()
+                      + "\" alt=\"" + name.toUtf8() + "\"/></span>";
+
+  if( imageCacheList.contains( name, Qt::CaseSensitive ) )
+  {
+    // We already have this image in cache
+    return urlStr;
+  }
+
+  if( !fullName.isEmpty() )
+  {
+    QFile f( fullName );
+    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
+    {
+      QByteArray buffer;
+      buffer.resize( BinaryBufferSize );
+      ssize_t length;
+
+      for( ; ; )
+      {
+        ret = eb_read_binary( &book, BinaryBufferSize,
+                              buffer.data(), &length );
+        if( ret != EB_SUCCESS )
+        {
+          setErrorString( "eb_read_binary", ret );
+          gdWarning( "Epwing image retrieve error: %s",
+                     error_string.toUtf8().data() );
+          break;
+        }
+
+        f.write( buffer.data(), length );
+
+        if( length < BinaryBufferSize )
+          break;
+      }
+      f.close();
+
+      imageCacheList.append( name );
+    }
+  }
+
+  return urlStr;
+}
+
+QByteArray EpwingBook::handleWave( EB_Hook_Code code, const unsigned int * argv )
+{
+
+  if( code == EB_HOOK_END_WAVE )
+    return QByteArray( "<img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" align=\"absmiddle\" alt=\"Play\"/></a></span>" );
+
+  // Handle EB_HOOK_BEGIN_WAVE
+
+  EB_Position spos, epos;
+  spos.page = argv[ 2 ];
+  spos.offset = argv[ 3 ];
+  epos.page = argv[ 4 ];
+  epos.offset = argv[ 5 ];
+
+  eb_set_binary_wave( &book, &spos, &epos );
+
+  if( cacheSoundsDir.isEmpty() )
+    cacheSoundsDir = createCacheDir( "sounds" );
+
+  QString name = makeFName( "wav", spos.page, spos.offset );
+  QString fullName;
+
+  if( !cacheSoundsDir.isEmpty() )
+    fullName = cacheSoundsDir + QDir::separator() + name;
+
+  QUrl url;
+  url.setScheme( "gdau" );
+  url.setHost( dictID );
+  url.setPath( name );
+
+  string ref = string( "\"" )+ url.toEncoded().data() + "\"";
+  QByteArray result = addAudioLink( ref , dictID.toUtf8().data() ).c_str();
+
+  result += QByteArray( "<span class=\"epwing_wav\"><a href=" ) + ref.c_str() + ">";
+
+  if( soundsCacheList.contains( name, Qt::CaseSensitive ) )
+  {
+    // We already have this sound in cache
+    return result;
+  }
+
+  if( !fullName.isEmpty() )
+  {
+    QFile f( fullName );
+    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
+    {
+      QByteArray buffer;
+      buffer.resize( BinaryBufferSize );
+      ssize_t length;
+
+      for( ; ; )
+      {
+        EB_Error_Code ret = eb_read_binary( &book, BinaryBufferSize,
+                                            buffer.data(), &length );
+        if( ret != EB_SUCCESS )
+        {
+          setErrorString( "eb_read_binary", ret );
+          gdWarning( "Epwing sound retrieve error: %s",
+                     error_string.toUtf8().data() );
+          break;
+        }
+
+        f.write( buffer.data(), length );
+
+        if( length < BinaryBufferSize )
+          break;
+      }
+      f.close();
+
+      soundsCacheList.append( name );
+    }
+  }
+  return result;
+}
+
+QByteArray EpwingBook::handleMpeg( EB_Hook_Code code, const unsigned int * argv )
+{
+
+  if( code == EB_HOOK_END_MPEG )
+    return QByteArray( "</a></span>" );
+
+  // Handle EB_HOOK_BEGIN_MPEG
+
+  char file[ EB_MAX_PATH_LENGTH + 1 ];
+
+  unsigned int *p = (unsigned int *)( argv + 2 );
+  eb_compose_movie_path_name( &book, p, file );
+
+  QString name = QString::fromLocal8Bit( file );
+  name = QFileInfo( name ).fileName();
+  name += ".mpg";
+
+  eb_set_binary_mpeg( &book, argv + 2 );
+
+  if( cacheMoviesDir.isEmpty() )
+    cacheMoviesDir = createCacheDir( "movies" );
+
+  QString fullName;
+
+  if( !cacheMoviesDir.isEmpty() )
+    fullName = cacheMoviesDir + QDir::separator() + name;
+
+  QUrl url;
+  url.setScheme( "gdvideo" );
+  url.setHost( dictID );
+  url.setPath( name );
+
+  QByteArray result = QByteArray( "<span class=\"epwing_mpeg\"><a href=" ) + url.toEncoded() + ">";
+
+  if( moviesCacheList.contains( name, Qt::CaseSensitive ) )
+  {
+    // We already have this movie in cache
+    return result;
+  }
+
+  if( !fullName.isEmpty() )
+  {
+    QFile f( fullName );
+    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
+    {
+      QByteArray buffer;
+      buffer.resize( BinaryBufferSize );
+      ssize_t length;
+
+      for( ; ; )
+      {
+        EB_Error_Code ret = eb_read_binary( &book, BinaryBufferSize,
+                                            buffer.data(), &length );
+        if( ret != EB_SUCCESS )
+        {
+          setErrorString( "eb_read_binary", ret );
+          gdWarning( "Epwing movie retrieve error: %s",
+                     error_string.toUtf8().data() );
+          break;
+        }
+
+        f.write( buffer.data(), length );
+
+        if( length < BinaryBufferSize )
+          break;
+      }
+      f.close();
+
+      moviesCacheList.append( name );
+    }
+  }
+  return result;
+}
+
+QByteArray EpwingBook::codeToUnicode( QString const & code )
+{
+  QString subst;
+
+  if( !customFontsMap.isEmpty() && customFontsMap.contains( code ) )
+  {
+    subst = QTextDocumentFragment::fromHtml( customFontsMap[ code ] )
+                                   .toPlainText();
+    return subst.toUtf8();
+  }
+
+  return EpwingCharmap::instance().mapToUtf8( code );
+}
+
+QByteArray EpwingBook::handleNarrowFont( const unsigned int * argv,
+                                         bool text_only )
+{
+  QString fcode = "n" + QString::number( *argv, 16 );
+
+  // Check substitution list
+
+  QByteArray b = codeToUnicode( fcode );
+  if( !b.isEmpty() || text_only )
+    return b;
+
+  // Find font image in book
+
+  if( !eb_have_narrow_font( &book ) )
+    return QByteArray( "?" );
+
+  QString fname = fcode + ".png";
+
+  if( cacheFontsDir.isEmpty() )
+    cacheFontsDir = createCacheDir( "fonts" );
+
+  QString fullName = cacheFontsDir + QDir::separator() + fname;
+
+  QUrl url;
+  url.setScheme( "file" );
+  url.setHost( "/");
+  url.setPath( fullName );
+
+  QByteArray link = "<img class=\"epwing_narrow_font\" src=\"" + url.toEncoded() + "\"/>";
+
+  if( fontsCacheList.contains( fname, Qt::CaseSensitive ) )
+  {
+    // We already have this image in cache
+    return link;
+  }
+
+  if( !cacheFontsDir.isEmpty() )
+  {
+    char bitmap[EB_SIZE_NARROW_FONT_16];
+    EB_Error_Code ret = eb_narrow_font_character_bitmap( &book, *argv, bitmap );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_narrow_font_character_bitmap", ret );
+      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      return QByteArray( "?" );
+    }
+
+      size_t nlen;
+      char buff[EB_SIZE_NARROW_FONT_16_PNG];
+      ret = eb_bitmap_to_png( bitmap, 8, 16, buff, &nlen );
+      if( ret != EB_SUCCESS )
+      {
+        setErrorString( "eb_bitmap_to_png", ret );
+        gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+        return QByteArray( "?" );
+      }
+
+
+    QFile f( fullName );
+    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
+    {
+      f.write( buff, nlen );
+      f.close();
+      fontsCacheList.append( fname );
+    }
+  }
+
+  return link;
+}
+
+QByteArray EpwingBook::handleWideFont( const unsigned int * argv,
+                                       bool text_only )
+{
+  QString fcode = "w" + QString::number( *argv, 16 );
+
+  // Check substitution list
+
+  QByteArray b = codeToUnicode( fcode );
+  if( !b.isEmpty() || text_only )
+    return b;
+
+  // Find font image in book
+
+  if( !eb_have_wide_font( &book ) )
+    return QByteArray( "?" );
+
+  QString fname = fcode + ".png";
+
+  if( cacheFontsDir.isEmpty() )
+    cacheFontsDir = createCacheDir( "fonts" );
+
+  QString fullName = cacheFontsDir + QDir::separator() + fname;
+
+  QUrl url;
+  url.setScheme( "file" );
+  url.setHost( "/");
+  url.setPath( fullName );
+
+  QByteArray link = "<img class=\"epwing_wide_font\" src=\"" + url.toEncoded() + "\"/>";
+
+  if( fontsCacheList.contains( fname, Qt::CaseSensitive ) )
+  {
+    // We already have this image in cache
+    return link;
+  }
+
+  if( !cacheFontsDir.isEmpty() )
+  {
+    char bitmap[EB_SIZE_WIDE_FONT_16];
+    EB_Error_Code ret = eb_wide_font_character_bitmap( &book, *argv, bitmap );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_wide_font_character_bitmap", ret );
+      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      return QByteArray( "?" );
+    }
+
+    size_t wlen;
+    char buff[EB_SIZE_WIDE_FONT_16_PNG];
+    ret = eb_bitmap_to_png( bitmap, 16, 16, buff, &wlen );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_bitmap_to_png", ret );
+      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      return QByteArray( "?" );
+    }
+
+    QFile f( fullName );
+    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
+    {
+      f.write( buff, wlen );
+      f.close();
+      fontsCacheList.append( fname );
+    }
+  }
+
+  return link;
+}
+
+QByteArray EpwingBook::handleReference( EB_Hook_Code code, const unsigned int * argv )
+{
+  if( code == EB_HOOK_BEGIN_REFERENCE )
+  {
+    if( refOpenCount > refCloseCount )
+      return QByteArray();
+
+    QString str;
+    str.sprintf( "<R%i>", refOpenCount );
+    refOpenCount += 1;
+    return str.toUtf8();
+  }
+
+  // EB_HOOK_END_REFERENCE
+
+  if( refCloseCount >= refOpenCount )
+    return QByteArray();
+
+  refPages.append( argv[ 1 ] );
+  refOffsets.append( argv[ 2 ] );
+
+  QString str;
+  str.sprintf( "</R%i>", refCloseCount );
+  refCloseCount += 1;
+
+  return str.toUtf8();
+}
+
+bool EpwingBook::getMatches( QString word, QVector< QString > & matches )
+{
+  QByteArray bword, bword2;
+  EB_Hit hits[ HitsBufferSize ];
+  int hitCount = 0;
+
+  if( book.character_code == EB_CHARCODE_ISO8859_1 && codec_ISO )
+    bword = codec_ISO->fromUnicode( word );
+  else
+  if( ( book.character_code == EB_CHARCODE_JISX0208 || book.character_code == EB_CHARCODE_JISX0208_GB2312 )
+      && codec_Euc )
+    bword = codec_Euc->fromUnicode( word );
+
+  if( book.character_code == EB_CHARCODE_JISX0208_GB2312 && codec_GB )
+    bword2 = codec_GB->fromUnicode( word );
+
+  if( !bword.isEmpty() )
+  {
+    EB_Error_Code ret = eb_search_word( &book, bword.data() );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_search_word", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+
+    ret = eb_hit_list( &book, 10, hits, &hitCount );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_hit_list", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+  }
+
+  if( hitCount == 0 && !bword2.isEmpty() )
+  {
+    EB_Error_Code ret = eb_search_word( &book, bword2.data() );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_search_word", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+
+    ret = eb_hit_list( &book, 10, hits, &hitCount );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_hit_list", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+  }
+
+  QVector< int > pages, offsets;
+
+  for( int i = 0; i < hitCount; i++ )
+  {
+    bool same_article = false;
+    for( int n = 0; n < pages.size(); n++ )
+    {
+      if( pages.at( n ) == hits[ i ].text.page
+          && offsets.at( n ) == hits[ i ].text.offset )
+      {
+        same_article = true;
+        continue;
+      }
+    }
+    if( !same_article )
+    {
+      pages.push_back( hits[ i ].text.page );
+      offsets.push_back( hits[ i ].text.offset );
+
+      QString headword;
+      if( readHeadword( hits[ i ].heading, headword, true ) )
+      {
+        if( isHeadwordCorrect( headword ) )
+          matches.push_back( headword );
+      }
+    }
+  }
+  return true;
+}
+
+bool EpwingBook::getArticlePos( QString word, QVector< int > & pages, QVector< int > & offsets )
+{
+  QByteArray bword, bword2;
+  EB_Hit hits[ HitsBufferSize ];
+  int hitCount = 0;
+
+  if( book.character_code == EB_CHARCODE_ISO8859_1 && codec_ISO )
+    bword = codec_ISO->fromUnicode( word );
+  else
+  if( ( book.character_code == EB_CHARCODE_JISX0208 || book.character_code == EB_CHARCODE_JISX0208_GB2312 )
+      && codec_Euc )
+    bword = codec_Euc->fromUnicode( word );
+
+  if( book.character_code == EB_CHARCODE_JISX0208_GB2312 && codec_GB )
+    bword2 = codec_GB->fromUnicode( word );
+
+  if( !bword.isEmpty() )
+  {
+    EB_Error_Code ret = eb_search_exactword( &book, bword.data() );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_search_word", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+
+    ret = eb_hit_list( &book, HitsBufferSize, hits, &hitCount );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_hit_list", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+  }
+
+  if( hitCount == 0 && !bword2.isEmpty() )
+  {
+    EB_Error_Code ret = eb_search_exactword( &book, bword2.data() );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_search_word", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+
+    ret = eb_hit_list( &book, HitsBufferSize, hits, &hitCount );
+    if( ret != EB_SUCCESS )
+    {
+      setErrorString( "eb_hit_list", ret );
+      gdWarning( "Epwing word search error: %s",
+                   error_string.toUtf8().data() );
+      return false;
+    }
+  }
+
+  for( int i = 0; i < hitCount; i++ )
+  {
+    bool same_article = false;
+    for( int n = 0; n < pages.size(); n++ )
+    {
+      if( pages.at( n ) == hits[ i ].text.page
+          && offsets.at( n ) == hits[ i ].text.offset )
+      {
+        same_article = true;
+        continue;
+      }
+    }
+    if( !same_article )
+    {
+      pages.push_back( hits[ i ].text.page );
+      offsets.push_back( hits[ i ].text.offset );
+    }
+  }
+
+  return !pages.empty();
+}
+
+Mutex EpwingBook::libMutex;
+
+} // namespace Book
+
+} // namespace Epwing
diff -Nru goldendict-1.5.0~git20131003/epwing_book.hh goldendict-1.5.0~git20150923/epwing_book.hh
--- goldendict-1.5.0~git20131003/epwing_book.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/epwing_book.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,239 @@
+#ifndef __EPWING_BOOK_HH_INCLUDED__
+#define __EPWING_BOOK_HH_INCLUDED__
+
+#include <qglobal.h>
+
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
+#define _FILE_OFFSET_BITS 64
+#endif
+
+#include "dictionary.hh"
+#include "ex.hh"
+#include "mutex.hh"
+
+#include <QString>
+#include <QTextCodec>
+#include <QMap>
+#include <QVector>
+#include <vector>
+#include <string>
+
+#include <eb/eb.h>
+
+namespace Epwing {
+
+DEF_EX_STR( exEbLibrary, "EB library report error", Dictionary::Ex )
+DEF_EX_STR( exEpwing, "Epwing parsing error:", Dictionary::Ex )
+
+void initialize();
+void finalize();
+
+namespace Book {
+
+using std::vector;
+using std::string;
+
+enum {
+  TextBufferSize = 4095,
+  BinaryBufferSize = 50000,
+  TextSizeLimit = 2800000
+};
+
+struct EpwingHeadword
+{
+  QString headword;
+  quint32 page;
+  quint32 offset;
+};
+
+class EpwingBook
+{
+  typedef QPair< int, int > EWPos;
+
+  void setErrorString( QString const & func, EB_Error_Code code );
+
+  EB_Book book;
+  EB_Appendix appendix;
+  EB_Hookset hookSet, refHookSet;
+  EB_Subbook_Code subBookList[ EB_MAX_SUBBOOKS ];
+  EB_Subbook_Code subAppendixList[ EB_MAX_SUBBOOKS ];
+  EB_Position currentPosition, indexHeadwordsPosition;
+  int subBookCount, subAppendixCount;
+  int currentSubBook;
+  QString error_string;
+  QString mainCacheDir, rootDir;
+  QString cacheImagesDir, cacheSoundsDir, cacheMoviesDir, cacheFontsDir;
+  QString dictID;
+  QTextCodec * codec_ISO, * codec_GB, * codec_Euc;
+  QStack< unsigned int > decorationStack;
+  int monoWidth, monoHeight;
+  QStringList imageCacheList, soundsCacheList, moviesCacheList, fontsCacheList;
+  QMap< QString, QString > baseFontsMap, customFontsMap;
+  QVector< int > refPages, refOffsets;
+  QMap< QString, EWPos > allHeadwordPositions;
+  QVector< EWPos > LinksQueue;
+  int refOpenCount, refCloseCount;
+  static Mutex libMutex;
+
+  QString createCacheDir( QString const & dir);
+
+  // Close unslosed tags
+  void finalizeText( QString & text );
+
+  // Reset internal variables
+  void prepareToRead();
+
+  // Retrieve references from article
+  void getReferencesFromText( int page, int offset );
+
+  // Move to next article
+  EB_Error_Code forwardText( EB_Position & startPos );
+
+  // Retrieve article text from dictionary
+  QString getText( int page, int offset, bool text_only );
+
+  unsigned int normalizeDecorationCode( unsigned int code );
+
+  QByteArray codeToUnicode( QString const & code );
+
+public:
+
+  enum DecorationCodes {
+    UNKNOWN = 0,
+    ITALIC = 1,
+    BOLD = 3,
+    EMPHASIS = 4,
+    SUBSCRIPT = 5,
+    SUPERSCRIPT = 6
+  };
+
+  EpwingBook();
+  ~EpwingBook();
+
+  Mutex & getLibMutex()
+  { return libMutex; }
+
+  QString const &errorString() const
+  { return error_string; }
+
+  QTextCodec * codecISO()
+  { return codec_ISO; }
+
+  QTextCodec * codecGB()
+  { return codec_GB; }
+
+  QTextCodec *codecEuc()
+  { return codec_Euc; }
+
+  int getSubBookCount()
+  { return subBookCount; }
+
+  void setDictID( const string & id )
+  { dictID = QString::fromUtf8( id.c_str() ); }
+
+  QString const & getImagesCacheDir()
+  { return cacheImagesDir; }
+
+  QString const & getSoundsCacheDir()
+  { return cacheSoundsDir; }
+
+  QString const & getMoviesCacheDir()
+  { return cacheMoviesDir; }
+
+  void clearBuffers()
+  {
+    allHeadwordPositions.clear();
+    LinksQueue.clear();
+  }
+
+
+  // Make name for resource
+  QString makeFName( QString const & ext, int page, int offset ) const;
+
+  // Store all files in Epwing folder
+  static void collectFilenames( QString const & directory,
+                                vector< string > & files );
+
+  // Initialize dictionary book
+  int setBook( string const & directory );
+
+  // Set subbook inside dictionary
+  bool setSubBook( int book_nom );
+
+  void setCacheDirectory( QString const & cacheDir );
+
+  QString getCurrentSubBookDirectory();
+
+  QString copyright();
+  QString title();
+
+  // Seek to first article
+  void getFirstHeadword( EpwingHeadword & head );
+
+  // Find next headword and article position
+  bool getNextHeadword( EpwingHeadword & head );
+
+  bool readHeadword( EB_Position const & pos,
+                     QString & headword,
+                     bool text_only );
+
+  bool isHeadwordCorrect( QString const & headword );
+
+  void fixHeadword( QString & headword );
+
+  // Retrieve article from dictionary
+  void getArticle( QString & headword, QString & articleText,
+                   int page, int offset, bool text_only );
+
+  const char * beginDecoration( unsigned int code );
+  const char * endDecoration( unsigned int code );
+
+  QByteArray handleColorImage( EB_Hook_Code code,
+                               const unsigned int * argv );
+
+  QByteArray handleMonoImage( EB_Hook_Code code,
+                              const unsigned int * argv );
+
+  QByteArray handleWave( EB_Hook_Code code,
+                         const unsigned int * argv );
+
+  QByteArray handleMpeg( EB_Hook_Code code,
+                         const unsigned int * argv );
+
+  QByteArray handleNarrowFont( const unsigned int * argv,
+                               bool text_only );
+
+  QByteArray handleWideFont( const unsigned int * argv,
+                             bool text_only );
+
+  QByteArray handleReference( EB_Hook_Code code,
+                              const unsigned int * argv );
+
+  bool getMatches( QString word, QVector< QString > & matches );
+
+  bool getArticlePos( QString word, QVector< int > & pages, QVector< int > & offsets );
+};
+
+struct EContainer
+{
+  EpwingBook * book;
+  bool textOnly;
+
+  EContainer( EpwingBook * book_ ) :
+    book( book_ ),
+    textOnly( false )
+  {}
+
+  EContainer( EpwingBook * book_, bool text_only ) :
+    book( book_ ),
+    textOnly( text_only )
+  {}
+};
+
+
+}
+
+}
+
+
+#endif // __EPWING_BOOK_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/epwing.cc goldendict-1.5.0~git20150923/epwing.cc
--- goldendict-1.5.0~git20131003/epwing.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/epwing.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,1185 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "epwing_book.hh"
+#include "epwing.hh"
+
+#include <QByteArray>
+#include <QDir>
+#include <QRunnable>
+#include <QSemaphore>
+
+#include <map>
+#include <set>
+#include <string>
+
+#include "btreeidx.hh"
+#include "folding.hh"
+#include "gddebug.hh"
+#include "fsencoding.hh"
+#include "chunkedstorage.hh"
+#include "wstring.hh"
+#include "wstring_qt.hh"
+#include "utf8.hh"
+#include "filetype.hh"
+#include "ftshelpers.hh"
+#include "btreeidx.hh"
+
+namespace Epwing {
+
+using BtreeIndexing::WordArticleLink;
+using BtreeIndexing::IndexedWords;
+using BtreeIndexing::IndexInfo;
+
+using std::map;
+using std::multimap;
+using std::vector;
+using std::set;
+using std::pair;
+using gd::wstring;
+
+namespace {
+
+#pragma pack( push, 1 )
+
+enum
+{
+  Signature = 0x58575045, // EPWX on little-endian, XWPE on big-endian
+  CurrentFormatVersion = 5 + BtreeIndexing::FormatVersion + Folding::Version
+};
+
+struct IdxHeader
+{
+  quint32 signature; // First comes the signature, EPWX
+  quint32 formatVersion; // File format version (CurrentFormatVersion)
+  quint32 chunksOffset; // The offset to chunks' storage
+  quint32 indexBtreeMaxElements; // Two fields from IndexInfo
+  quint32 indexRootOffset;
+  quint32 wordCount;
+  quint32 articleCount;
+  quint32 nameSize;
+  quint32 langFrom;  // Source language
+  quint32 langTo;    // Target language
+}
+#ifndef _MSC_VER
+__attribute__((packed))
+#endif
+;
+
+#pragma pack( pop )
+
+bool indexIsOldOrBad( string const & indexFile )
+{
+  File::Class idx( indexFile, "rb" );
+
+  IdxHeader header;
+
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
+         header.signature != Signature ||
+         header.formatVersion != CurrentFormatVersion;
+}
+
+class EpwingDictionary: public BtreeIndexing::BtreeDictionary
+{
+  Mutex idxMutex;
+  File::Class idx;
+  IdxHeader idxHeader;
+  string bookName;
+  ChunkedStorage::Reader chunks;
+  Epwing::Book::EpwingBook eBook;
+  QString cacheDirectory;
+
+public:
+
+  EpwingDictionary( string const & id, string const & indexFile,
+                    vector< string > const & dictionaryFiles,
+                    int subBook );
+
+  ~EpwingDictionary();
+
+  virtual string getName() throw()
+  { return bookName; }
+
+  virtual map< Dictionary::Property, string > getProperties() throw()
+  { return map< Dictionary::Property, string >(); }
+
+  virtual unsigned long getArticleCount() throw()
+  { return idxHeader.articleCount; }
+
+  virtual unsigned long getWordCount() throw()
+  { return idxHeader.wordCount; }
+
+  inline virtual quint32 getLangFrom() const
+  { return idxHeader.langFrom; }
+
+  inline virtual quint32 getLangTo() const
+  { return idxHeader.langTo; }
+
+  virtual QString const& getDescription();
+
+  virtual sptr< Dictionary::DataRequest > getArticle( wstring const &,
+                                                      vector< wstring > const & alts,
+                                                      wstring const & )
+    throw( std::exception );
+
+  virtual sptr< Dictionary::DataRequest > getResource( string const & name )
+    throw( std::exception );
+
+  virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                            int searchMode, bool matchCase,
+                                                            int distanceBetweenWords,
+                                                            int maxResults );
+  virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+  virtual void setFTSParameters( Config::FullTextSearch const & fts )
+  {
+    if( ensureInitDone().size() )
+      return;
+
+    can_FTS = fts.enabled
+              && !fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive )
+              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
+
+  static int japaneseWriting( gd::wchar ch );
+
+  static bool isSign( gd::wchar ch );
+
+  static bool isJapanesePunctiation( gd::wchar ch );
+
+  virtual sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &,
+                                                             unsigned long )
+    throw( std::exception );
+
+  virtual sptr< Dictionary::WordSearchRequest > stemmedMatch( wstring const &,
+                                                              unsigned minLength,
+                                                              unsigned maxSuffixVariation,
+                                                              unsigned long maxResults )
+    throw( std::exception );
+
+protected:
+
+  void loadIcon() throw();
+
+private:
+
+  /// Loads the article.
+  void loadArticle( quint32 address, string & articleHeadword,
+                    string & articleText, int & articlePage, int & articleOffset );
+
+  void loadArticle( int articlePage, int articleOffset, string & articleHeadword,
+                    string & articleText );
+
+  void createCacheDirectory();
+
+  void removeDirectory( QString const & directory );
+
+  QString const & getImagesCacheDir()
+  { return eBook.getImagesCacheDir(); }
+
+  QString const & getSoundsCacheDir()
+  { return eBook.getSoundsCacheDir(); }
+
+  QString const & getMoviesCacheDir()
+  { return eBook.getMoviesCacheDir(); }
+
+  friend class EpwingArticleRequest;
+  friend class EpwingResourceRequest;
+  friend class EpwingWordSearchRequest;
+};
+
+
+EpwingDictionary::EpwingDictionary( string const & id,
+                                    string const & indexFile,
+                                    vector< string > const & dictionaryFiles,
+                                    int subBook ):
+  BtreeDictionary( id, dictionaryFiles ),
+  idx( indexFile, "rb" ),
+  idxHeader( idx.read< IdxHeader >() ),
+  chunks( idx, idxHeader.chunksOffset )
+{
+  vector< char > data( idxHeader.nameSize );
+  idx.seek( sizeof( idxHeader ) );
+  idx.read( &data.front(), idxHeader.nameSize );
+  bookName = string( &data.front(), idxHeader.nameSize );
+
+  // Initialize eBook
+
+  eBook.setBook( dictionaryFiles[ 0 ] );
+  eBook.setSubBook( subBook );
+
+  // Initialize the index
+
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
+                        idxHeader.indexRootOffset ),
+             idx, idxMutex );
+
+  eBook.setDictID( getId() );
+
+  cacheDirectory = QDir::tempPath() + QDir::separator()
+                   + QString::fromUtf8( getId().c_str() )
+                   + ".cache";
+  eBook.setCacheDirectory( cacheDirectory );
+
+  // Full-text search parameters
+
+  can_FTS = true;
+
+  ftsIdxName = indexFile + "_FTS";
+
+  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+    FTS_index_completed.ref();
+}
+
+EpwingDictionary::~EpwingDictionary()
+{
+  removeDirectory( cacheDirectory );
+}
+
+void EpwingDictionary::loadIcon() throw()
+{
+  if ( dictionaryIconLoaded )
+    return;
+
+  QString fileName = FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() )
+                     + QDir::separator()
+                     + eBook.getCurrentSubBookDirectory() + ".";
+
+  if( !fileName.isEmpty() )
+    loadIconFromFile( fileName );
+
+  if( dictionaryIcon.isNull() )
+  {
+    // Load failed -- use default icons
+    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_epwing.png");
+  }
+
+  dictionaryIconLoaded = true;
+}
+
+void EpwingDictionary::removeDirectory( QString const & directory )
+{
+  QDir dir( directory );
+  Q_FOREACH( QFileInfo info, dir.entryInfoList( QDir::NoDotAndDotDot
+                                                | QDir::AllDirs
+                                                | QDir::Files,
+                                                QDir::DirsFirst))
+  {
+    if( info.isDir() )
+      removeDirectory( info.absoluteFilePath() );
+    else
+      QFile::remove( info.absoluteFilePath() );
+  }
+
+  dir.rmdir( directory );
+}
+
+void EpwingDictionary::loadArticle( quint32 address,
+                                    string & articleHeadword,
+                                    string & articleText,
+                                    int & articlePage,
+                                    int & articleOffset )
+{
+  vector< char > chunk;
+
+  char * articleProps;
+
+  {
+    Mutex::Lock _( idxMutex );
+    articleProps = chunks.getBlock( address, chunk );
+  }
+
+  memcpy( &articlePage, articleProps, sizeof( articlePage ) );
+  memcpy( &articleOffset, articleProps + sizeof( articlePage ),
+          sizeof( articleOffset ) );
+
+  QString headword, text;
+
+  try
+  {
+    Mutex::Lock _( eBook.getLibMutex() );
+    eBook.getArticle( headword, text, articlePage, articleOffset, false );
+  }
+  catch( std::exception & e )
+  {
+    text = QString( "Article reading error: %1")
+           .arg( QString::fromUtf8( e.what() ) );
+  }
+
+  articleHeadword = string( headword.toUtf8().data() );
+  articleText = string( text.toUtf8().data() );
+
+  string prefix( "<div class=\"epwing_text\">" );
+
+  articleText = prefix + articleText + "</div>";
+}
+
+void EpwingDictionary::loadArticle( int articlePage,
+                                    int articleOffset,
+                                    string & articleHeadword,
+                                    string & articleText )
+{
+  QString headword, text;
+
+  try
+  {
+    Mutex::Lock _( eBook.getLibMutex() );
+    eBook.getArticle( headword, text, articlePage, articleOffset, false );
+  }
+  catch( std::exception & e )
+  {
+    text = QString( "Article reading error: %1")
+           .arg( QString::fromUtf8( e.what() ) );
+  }
+
+  articleHeadword = string( headword.toUtf8().data() );
+  articleText = string( text.toUtf8().data() );
+
+  string prefix( "<div class=\"epwing_text\">" );
+
+  articleText = prefix + articleText + "</div>";
+}
+
+QString const& EpwingDictionary::getDescription()
+{
+  if( !dictionaryDescription.isEmpty() )
+    return dictionaryDescription;
+
+  dictionaryDescription = "NONE";
+
+  QString str;
+  {
+    Mutex::Lock _( eBook.getLibMutex() );
+    str = eBook.copyright();
+  }
+
+  if( !str.isEmpty() )
+    dictionaryDescription = str;
+
+  return dictionaryDescription;
+}
+
+void EpwingDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+
+  if( haveFTSIndex() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "Epwing: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Epwing: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void EpwingDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  headword.clear();
+  text.clear();
+
+  vector< char > chunk;
+  char * articleProps;
+
+  {
+    Mutex::Lock _( idxMutex );
+    articleProps = chunks.getBlock( articleAddress, chunk );
+  }
+
+  uint32_t articlePage, articleOffset;
+
+  memcpy( &articlePage, articleProps, sizeof( articlePage ) );
+  memcpy( &articleOffset, articleProps + sizeof( articlePage ),
+          sizeof( articleOffset ) );
+
+  try
+  {
+    Mutex::Lock _( eBook.getLibMutex() );
+    eBook.getArticle( headword, text, articlePage, articleOffset, true );
+  }
+  catch( std::exception & e )
+  {
+    text = QString( "Article reading error: %1")
+           .arg( QString::fromUtf8( e.what() ) );
+  }
+}
+
+/// EpwingDictionary::getArticle()
+
+class EpwingArticleRequest;
+
+class EpwingArticleRequestRunnable: public QRunnable
+{
+  EpwingArticleRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  EpwingArticleRequestRunnable( EpwingArticleRequest & r_,
+                                QSemaphore & hasExited_ ): r( r_ ),
+                                                           hasExited( hasExited_ )
+  {}
+
+  ~EpwingArticleRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class EpwingArticleRequest: public Dictionary::DataRequest
+{
+  friend class EpwingArticleRequestRunnable;
+
+  wstring word;
+  vector< wstring > alts;
+  EpwingDictionary & dict;
+
+  QAtomicInt isCancelled;
+  QSemaphore hasExited;
+
+public:
+
+  EpwingArticleRequest( wstring const & word_,
+                        vector< wstring > const & alts_,
+                        EpwingDictionary & dict_ ):
+    word( word_ ), alts( alts_ ), dict( dict_ )
+  {
+    QThreadPool::globalInstance()->start(
+      new EpwingArticleRequestRunnable( *this, hasExited ) );
+  }
+
+  void run(); // Run from another thread by EpwingArticleRequestRunnable
+
+  virtual void cancel()
+  {
+    isCancelled.ref();
+  }
+
+  ~EpwingArticleRequest()
+  {
+    isCancelled.ref();
+    hasExited.acquire();
+  }
+};
+
+void EpwingArticleRequestRunnable::run()
+{
+  r.run();
+}
+
+void EpwingArticleRequest::run()
+{
+  if ( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  vector< WordArticleLink > chain = dict.findArticles( word );
+
+  for( unsigned x = 0; x < alts.size(); ++x )
+  {
+    /// Make an additional query for each alt
+
+    vector< WordArticleLink > altChain = dict.findArticles( alts[ x ] );
+
+    chain.insert( chain.end(), altChain.begin(), altChain.end() );
+  }
+
+  multimap< wstring, pair< string, string > > mainArticles, alternateArticles;
+
+  set< quint32 > articlesIncluded; // Some synonims make it that the articles
+                                    // appear several times. We combat this
+                                    // by only allowing them to appear once.
+
+  wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
+
+  QVector< int > pages, offsets;
+
+  for( unsigned x = 0; x < chain.size(); ++x )
+  {
+    if ( isCancelled )
+    {
+      finish();
+      return;
+    }
+
+    if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
+      continue; // We already have this article in the body.
+
+    // Now grab that article
+
+    string headword, articleText;
+    int articlePage, articleOffset;
+
+    try
+    {
+      dict.loadArticle( chain[ x ].articleOffset, headword, articleText,
+                        articlePage, articleOffset );
+    }
+    catch(...)
+    {
+    }
+
+    pages.append( articlePage );
+    offsets.append( articleOffset );
+
+    // Ok. Now, does it go to main articles, or to alternate ones? We list
+    // main ones first, and alternates after.
+
+    // We do the case-folded comparison here.
+
+    wstring headwordStripped =
+      Folding::applySimpleCaseOnly( Utf8::decode( headword ) );
+
+    multimap< wstring, pair< string, string > > & mapToUse =
+      ( wordCaseFolded == headwordStripped ) ?
+        mainArticles : alternateArticles;
+
+    mapToUse.insert( pair< wstring, pair< string, string > >(
+      Folding::applySimpleCaseOnly( Utf8::decode( headword ) ),
+      pair< string, string >( headword, articleText ) ) );
+
+    articlesIncluded.insert( chain[ x ].articleOffset );
+  }
+
+  // Also try to find word in the built-in dictionary index
+  try
+  {
+    string headword, articleText;
+
+    QVector< int > pg, off;
+    {
+      Mutex::Lock _( dict.eBook.getLibMutex() );
+      dict.eBook.getArticlePos( gd::toQString( word ), pg, off );
+    }
+
+    for( int i = 0; i < pg.size(); i++ )
+    {
+      bool already = false;
+      for( int n = 0; n < pages.size(); n++ )
+      {
+        if( pages.at( n ) == pg.at( i )
+            && abs( offsets.at( n ) - off.at( i ) ) <= 4 )
+        {
+          already = true;
+          break;
+        }
+      }
+
+      if( !already )
+      {
+        dict.loadArticle( pg.at( i ), off.at( i ), headword, articleText );
+
+        mainArticles.insert( pair< wstring, pair< string, string > >(
+          Folding::applySimpleCaseOnly( Utf8::decode( headword ) ),
+          pair< string, string >( headword, articleText ) ) );
+
+        pages.append( pg.at( i ) );
+        offsets.append( off.at( i ) );
+      }
+    }
+  }
+  catch(...)
+  {
+  }
+
+  if ( mainArticles.empty() && alternateArticles.empty() )
+  {
+    // No such word
+    finish();
+    return;
+  }
+
+  string result = "<span class=\"epwing_article\">";
+
+  multimap< wstring, pair< string, string > >::const_iterator i;
+
+  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
+  {
+      result += "<h3>";
+      result += i->second.first;
+      result += "</h3>";
+      result += i->second.second;
+  }
+
+  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
+  {
+      result += "<h3>";
+      result += i->second.first;
+      result += "</h3>";
+      result += i->second.second;
+  }
+
+  result += "</span>";
+
+  Mutex::Lock _( dataMutex );
+
+  data.resize( result.size() );
+
+  memcpy( &data.front(), result.data(), result.size() );
+
+  hasAnyData = true;
+
+  finish();
+}
+
+sptr< Dictionary::DataRequest > EpwingDictionary::getArticle( wstring const & word,
+                                                              vector< wstring > const & alts,
+                                                              wstring const & )
+  throw( std::exception )
+{
+  return new EpwingArticleRequest( word, alts, *this );
+}
+
+//// EpwingDictionary::getResource()
+
+class EpwingResourceRequest;
+
+class EpwingResourceRequestRunnable: public QRunnable
+{
+  EpwingResourceRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  EpwingResourceRequestRunnable( EpwingResourceRequest & r_,
+                              QSemaphore & hasExited_ ): r( r_ ),
+                                                         hasExited( hasExited_ )
+  {}
+
+  ~EpwingResourceRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class EpwingResourceRequest: public Dictionary::DataRequest
+{
+  friend class EpwingResourceRequestRunnable;
+
+  EpwingDictionary & dict;
+
+  string resourceName;
+
+  QAtomicInt isCancelled;
+  QSemaphore hasExited;
+
+public:
+
+  EpwingResourceRequest( EpwingDictionary & dict_,
+                      string const & resourceName_ ):
+    dict( dict_ ),
+    resourceName( resourceName_ )
+  {
+    QThreadPool::globalInstance()->start(
+      new EpwingResourceRequestRunnable( *this, hasExited ) );
+  }
+
+  void run(); // Run from another thread by EpwingResourceRequestRunnable
+
+  virtual void cancel()
+  {
+    isCancelled.ref();
+  }
+
+  ~EpwingResourceRequest()
+  {
+    isCancelled.ref();
+    hasExited.acquire();
+  }
+};
+
+void EpwingResourceRequestRunnable::run()
+{
+  r.run();
+}
+
+void EpwingResourceRequest::run()
+{
+  // Some runnables linger enough that they are cancelled before they start
+  if ( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  QString cacheDir;
+  {
+    Mutex::Lock _( dict.eBook.getLibMutex() );
+    if( Filetype::isNameOfPicture( resourceName ) )
+      cacheDir = dict.getImagesCacheDir();
+    else
+    if( Filetype::isNameOfSound( resourceName ) )
+      cacheDir = dict.getSoundsCacheDir();
+    else
+    if( Filetype::isNameOfVideo( resourceName ) )
+      cacheDir = dict.getMoviesCacheDir();
+  }
+
+  try
+  {
+    if( cacheDir.isEmpty() )
+    {
+      finish();
+      return;
+    }
+
+    QString fullName = cacheDir + QDir::separator()
+                       + FsEncoding::decode( resourceName.c_str() );
+
+    QFile f( fullName );
+    if( f.open( QFile::ReadOnly ) )
+    {
+      QByteArray buffer = f.readAll();
+
+      Mutex::Lock _( dataMutex );
+
+      data.resize( buffer.size() );
+
+      memcpy( &data.front(), buffer.data(), data.size() );
+
+      hasAnyData = true;
+    }
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Epwing: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
+               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+    // Resource not loaded -- we don't set the hasAnyData flag then
+  }
+
+  finish();
+}
+
+sptr< Dictionary::DataRequest > EpwingDictionary::getResource( string const & name )
+  throw( std::exception )
+{
+  return new EpwingResourceRequest( *this, name );
+}
+
+
+sptr< Dictionary::DataRequest > EpwingDictionary::getSearchResults( QString const & searchString,
+                                                                    int searchMode, bool matchCase,
+                                                                    int distanceBetweenWords,
+                                                                    int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
+int EpwingDictionary::japaneseWriting( gd::wchar ch )
+{
+  if( ( ch >= 0x30A0 && ch <= 0x30FF )
+      || ( ch >= 0x31F0 && ch <= 0x31FF )
+      || ( ch >= 0x3200 && ch <= 0x32FF )
+      || ( ch >= 0xFF00 && ch <= 0xFFEF )
+      || ( ch == 0x1B000 ) )
+    return 1; // Katakana
+  else
+  if( ( ch >= 0x3040 && ch <= 0x309F )
+      || ( ch == 0x1B001 ) )
+    return 2; // Hiragana
+  else
+  if( ( ch >= 0x4E00 && ch <= 0x9FAF )
+      || ( ch >= 0x3400 && ch <= 0x4DBF ) )
+    return 3; // Kanji
+
+  return 0;
+}
+
+bool EpwingDictionary::isSign( gd::wchar ch )
+{
+  switch( ch )
+  {
+    case 0x002B: // PLUS SIGN
+    case 0x003C: // LESS-THAN SIGN
+    case 0x003D: // EQUALS SIGN
+    case 0x003E: // GREATER-THAN SIGN
+    case 0x00AC: // NOT SIGN
+    case 0xFF0B: // FULLWIDTH PLUS SIGN
+    case 0xFF1C: // FULLWIDTH LESS-THAN SIGN
+    case 0xFF1D: // FULLWIDTH EQUALS SIGN
+    case 0xFF1E: // FULLWIDTH GREATER-THAN SIGN
+    case 0xFFE2: // FULLWIDTH NOT SIGN
+      return true;
+
+    default:
+      return false;
+  }
+}
+
+bool EpwingDictionary::isJapanesePunctiation( gd::wchar ch )
+{
+  return ch >= 0x3000 && ch <= 0x303F;
+}
+
+class EpwingWordSearchRequest;
+
+class EpwingWordSearchRunnable: public QRunnable
+{
+  EpwingWordSearchRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  EpwingWordSearchRunnable( EpwingWordSearchRequest & r_,
+                            QSemaphore & hasExited_ ): r( r_ ),
+                                                       hasExited( hasExited_ )
+  {}
+
+  ~EpwingWordSearchRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class EpwingWordSearchRequest: public BtreeIndexing::BtreeWordSearchRequest
+{
+  friend class EpwingWordSearchRunnable;
+
+  EpwingDictionary & edict;
+
+public:
+
+  EpwingWordSearchRequest( EpwingDictionary & dict_,
+                           wstring const & str_,
+                           unsigned minLength_,
+                           int maxSuffixVariation_,
+                           bool allowMiddleMatches_,
+                           unsigned long maxResults_ ):
+    BtreeWordSearchRequest( dict_, str_, minLength_, maxSuffixVariation_, allowMiddleMatches_, maxResults_, false ),
+    edict( dict_ )
+  {
+    QThreadPool::globalInstance()->start(
+      new EpwingWordSearchRunnable( *this, hasExited ) );
+  }
+
+  virtual void findMatches();
+};
+
+void EpwingWordSearchRunnable::run()
+{
+  r.run();
+}
+
+void EpwingWordSearchRequest::findMatches()
+{
+  BtreeWordSearchRequest::findMatches();
+  if ( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  while( matches.size() < maxResults )
+  {
+    QVector< QString > headwords;
+    {
+      Mutex::Lock _( edict.eBook.getLibMutex() );
+      if( isCancelled )
+        break;
+
+      if( !edict.eBook.getMatches( gd::toQString( str ), headwords ) )
+        break;
+    }
+
+    Mutex::Lock _( dataMutex );
+
+    for( int i = 0; i < headwords.size(); i++ )
+      addMatch( gd::toWString( headwords.at( i ) ) );
+
+    break;
+  }
+
+  finish();
+}
+
+sptr< Dictionary::WordSearchRequest > EpwingDictionary::prefixMatch(
+  wstring const & str, unsigned long maxResults )
+  throw( std::exception )
+{
+  return new EpwingWordSearchRequest( *this, str, 0, -1, true, maxResults );
+}
+
+sptr< Dictionary::WordSearchRequest > EpwingDictionary::stemmedMatch(
+  wstring const & str, unsigned minLength, unsigned maxSuffixVariation,
+  unsigned long maxResults )
+  throw( std::exception )
+{
+  return new EpwingWordSearchRequest( *this, str, minLength, (int)maxSuffixVariation,
+                                      false, maxResults );
+}
+
+} // anonymous namespace
+
+vector< sptr< Dictionary::Class > > makeDictionaries(
+                                      vector< string > const & fileNames,
+                                      string const & indicesDir,
+                                      Dictionary::Initializing & initializing )
+  throw( std::exception )
+{
+  vector< sptr< Dictionary::Class > > dictionaries;
+
+  vector< string > dictFiles;
+  QByteArray catName;
+  catName += QDir::separator();
+  catName += "catalogs";
+
+  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
+       ++i )
+  {
+      // Skip files other than "catalogs" to speed up the scanning
+
+      if ( i->size() < (unsigned)catName.size() ||
+          strcasecmp( i->c_str() + ( i->size() - catName.size() ), catName.data() ) != 0 )
+        continue;
+
+      int ndir = i->size() - catName.size();
+      if( ndir < 1 )
+        ndir = 1;
+
+      string mainDirectory = i->substr( 0, ndir );
+
+      Epwing::Book::EpwingBook dict;
+
+      int subBooksNumber = dict.setBook( mainDirectory );
+
+      for( int sb = 0; sb < subBooksNumber; sb++ )
+      {
+        QString dir;
+
+        try
+        {
+          dictFiles.clear();
+          dictFiles.push_back( mainDirectory );
+          dictFiles.push_back( *i );
+
+          dict.setSubBook( sb );
+
+          dir = FsEncoding::decode( mainDirectory.c_str() )
+                + FsEncoding::separator()
+                + dict.getCurrentSubBookDirectory();
+
+          Epwing::Book::EpwingBook::collectFilenames( dir, dictFiles );
+
+          QString fontSubName = FsEncoding::decode( mainDirectory.c_str() )
+                                + QDir::separator()
+                                + "afonts_" + QString::number( sb );
+          QFileInfo info( fontSubName );
+          if( info.exists() && info.isFile() )
+            dictFiles.push_back( FsEncoding::encode( fontSubName ) );
+
+          // Check if we need to rebuid the index
+
+          string dictId = Dictionary::makeDictionaryId( dictFiles );
+
+          string indexFile = indicesDir + dictId;
+
+          if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
+                 indexIsOldOrBad( indexFile ) )
+          {
+            gdDebug( "Epwing: Building the index for dictionary in directory %s\n", dir.toUtf8().data() );
+
+            QString str = dict.title();
+            QByteArray nameData = str.toUtf8();
+            initializing.indexingDictionary( nameData.data() );
+
+            File::Class idx( indexFile, "wb" );
+
+            IdxHeader idxHeader;
+
+            memset( &idxHeader, 0, sizeof( idxHeader ) );
+
+            // We write a dummy header first. At the end of the process the header
+            // will be rewritten with the right values.
+
+            idx.write( idxHeader );
+
+            idx.write( nameData.data(), nameData.size() );
+            idxHeader.nameSize = nameData.size();
+
+            IndexedWords indexedWords;
+
+            ChunkedStorage::Writer chunks( idx );
+
+            Epwing::Book::EpwingHeadword head;
+
+            dict.getFirstHeadword( head );
+
+            int wordCount = 0;
+            int articleCount = 0;
+
+            for( ; ; )
+            {
+              if( !head.headword.isEmpty() )
+              {
+                uint32_t offset = chunks.startNewBlock();
+                chunks.addToBlock( &head.page, sizeof( head.page ) );
+                chunks.addToBlock( &head.offset, sizeof( head.offset ) );
+
+                wstring hw = gd::toWString( head.headword );
+
+                indexedWords.addWord( hw, offset );
+                wordCount++;
+                articleCount++;
+
+                vector< wstring > words;
+
+                // Parse combined kanji/katakana/hiragana headwords
+
+                int w_prev = 0;
+                wstring word;
+                for( wstring::size_type n = 0; n < hw.size(); n++ )
+                {
+                  gd::wchar ch = hw[ n ];
+
+                  if( Folding::isPunct( ch ) || Folding::isWhitespace( ch )
+                      || EpwingDictionary::isSign( ch ) || EpwingDictionary::isJapanesePunctiation( ch ) )
+                    continue;
+
+                  int w = EpwingDictionary::japaneseWriting( ch );
+
+                  if( w > 0 )
+                  {
+                    // Store only separated words
+                    gd::wchar ch_prev = 0;
+                    if( n )
+                      ch_prev = hw[ n - 1 ];
+                    bool needStore = ( n == 0
+                                       || Folding::isPunct( ch_prev )
+                                       || Folding::isWhitespace( ch_prev )
+                                       || EpwingDictionary::isJapanesePunctiation( ch ) );
+
+                    word.push_back( ch );
+                    w_prev = w;
+                    wstring::size_type i;
+                    for(  i = n + 1; i < hw.size(); i++ )
+                    {
+                      ch = hw[ i ];
+                      if( Folding::isPunct( ch ) || Folding::isWhitespace( ch )
+                          || EpwingDictionary::isJapanesePunctiation( ch ) )
+                        break;
+                      w = EpwingDictionary::japaneseWriting( ch );
+                      if( w != w_prev )
+                        break;
+                      word.push_back( ch );
+                    }
+
+                    if( needStore )
+                    {
+                      if( i >= hw.size() || Folding::isPunct( ch ) || Folding::isWhitespace( ch )
+                          || EpwingDictionary::isJapanesePunctiation( ch ) )
+                        words.push_back( word );
+                    }
+                    word.clear();
+
+                    if( i < hw.size() )
+                      n = i;
+                    else
+                      break;
+                  }
+                }
+
+                if( words.size() > 1 )
+                {
+                  // Allow only one word in every charset
+
+                  size_t n;
+                  int writings[ 4 ];
+                  memset( writings, 0, sizeof(writings) );
+
+                  for( n = 0; n < words.size(); n++ )
+                  {
+                    int w = EpwingDictionary::japaneseWriting( words[ n ][ 0 ] );
+                    if( writings[ w ] )
+                      break;
+                    else
+                      writings[ w ] = 1;
+                  }
+
+                  if( n >= words.size() )
+                  {
+                    for( n = 0; n < words.size(); n++ )
+                    {
+                      indexedWords.addWord( words[ n ], offset );
+                      wordCount++;
+                    }
+                  }
+                }
+
+              }
+              if( !dict.getNextHeadword( head ) )
+                break;
+            }
+
+            dict.clearBuffers();
+
+            // Finish with the chunks
+
+            idxHeader.chunksOffset = chunks.finish();
+
+            // Build index
+
+            IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
+
+            idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
+            idxHeader.indexRootOffset = idxInfo.rootOffset;
+
+            indexedWords.clear(); // Release memory -- no need for this data
+
+            // That concludes it. Update the header.
+
+            idxHeader.signature = Signature;
+            idxHeader.formatVersion = CurrentFormatVersion;
+
+            idxHeader.wordCount = wordCount;
+            idxHeader.articleCount = articleCount;
+
+            idx.rewind();
+
+            idx.write( &idxHeader, sizeof( idxHeader ) );
+
+
+          } // If need to rebuild
+
+          dictionaries.push_back( new EpwingDictionary( dictId,
+                                                        indexFile,
+                                                        dictFiles,
+                                                        sb ) );
+        }
+        catch( std::exception & e )
+        {
+          gdWarning( "Epwing dictionary initializing failed: %s, error: %s\n",
+                     dir.toUtf8().data(), e.what() );
+          continue;
+        }
+      }
+
+  }
+  return dictionaries;
+}
+
+} // namespace Epwing
diff -Nru goldendict-1.5.0~git20131003/epwing_charmap.cc goldendict-1.5.0~git20150923/epwing_charmap.cc
--- goldendict-1.5.0~git20131003/epwing_charmap.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/epwing_charmap.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,97 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "epwing_charmap.hh"
+
+namespace Epwing {
+
+EpwingCharmap & EpwingCharmap::instance()
+{
+  static EpwingCharmap ec;
+  return ec;
+}
+
+QByteArray EpwingCharmap::mapToUtf8( QString const & code )
+{
+  if( charMap.contains( code ) )
+    return QString( charMap[ code ] ).toUtf8();
+
+  return QByteArray();
+}
+
+void EpwingCharmap::addEntry( QString const & code, QChar ch )
+{
+  charMap[ code ] = ch;
+}
+
+EpwingCharmap::EpwingCharmap()
+{
+  addEntry( "na121", 0x00E1 );
+  addEntry( "na122", 0x00E0 );
+  addEntry( "na12a", 0x01DD );
+  addEntry( "na12e", 0x00E9 );
+  addEntry( "na12f", 0x00E8 );
+  addEntry( "na134", 0x00ED );
+  addEntry( "na135", 0x00EC );
+  addEntry( "na136", 0x00F3 );
+  addEntry( "na137", 0x00F2 );
+  addEntry( "na13e", 0x00FA );
+  addEntry( "na13f", 0x00F9 );
+  addEntry( "na143", 0x00E6 );
+  addEntry( "na144", 0x01FD );
+  addEntry( "na149", 0x0067 );
+  addEntry( "na157", 0x00E9 );
+  addEntry( "na16a", 0x00C1 );
+  addEntry( "na16b", 0x00C0 );
+  addEntry( "na16d", 0x00C9 );
+  addEntry( "na171", 0x00FD );
+  addEntry( "na172", 0x1EF3 );
+  addEntry( "na17d", 0x00DA );
+  addEntry( "na235", 0x002F );
+  addEntry( "na240", 0x0154 );
+  addEntry( "na244", 0x0179 );
+  addEntry( "na627", 0x00A7 );
+  addEntry( "na62b", 0x00AB );
+  addEntry( "na637", 0x30FB );
+  addEntry( "na63b", 0x00BB );
+  addEntry( "na646", 0x00C6 );
+  addEntry( "na647", 0x00C7 );
+  addEntry( "na649", 0x00C9 );
+  addEntry( "na660", 0x00E0 );
+  addEntry( "na662", 0x00E2 );
+  addEntry( "na664", 0x00E4 );
+  addEntry( "na667", 0x00E7 );
+  addEntry( "na668", 0x00E8 );
+  addEntry( "na669", 0x00E9 );
+  addEntry( "na66a", 0x00EA );
+  addEntry( "na66b", 0x00EB );
+  addEntry( "na66e", 0x00EE );
+  addEntry( "na66f", 0x00EF );
+  addEntry( "na671", 0x00F1 );
+  addEntry( "na674", 0x00F4 );
+  addEntry( "na676", 0x00F6 );
+  addEntry( "na67b", 0x00FB );
+  addEntry( "na67c", 0x00FC );
+  addEntry( "na722", 0x0152 );
+  addEntry( "na723", 0x0153 );
+  addEntry( "na73e", 0x0101 );
+  addEntry( "na73f", 0x0103 );
+  addEntry( "na740", 0x0113 );
+  addEntry( "na741", 0x0115 );
+  addEntry( "na742", 0x012B );
+  addEntry( "na743", 0x012D );
+  addEntry( "na744", 0x014F );
+  addEntry( "na746", 0x016B );
+  addEntry( "na747", 0x01D4 );
+  addEntry( "na74b", 0x0227 );
+  addEntry( "na753", 0x1EBD );
+  addEntry( "na823", 0x2026 );
+  addEntry( "wa424", 0x00E6 );
+  addEntry( "wa460", 0x2460 );
+  addEntry( "wa461", 0x2461 );
+  addEntry( "wa462", 0x2462 );
+  addEntry( "wa463", 0x2463 );
+  addEntry( "wa464", 0x2464 );
+}
+
+} // namespace Epwing
diff -Nru goldendict-1.5.0~git20131003/epwing_charmap.hh goldendict-1.5.0~git20150923/epwing_charmap.hh
--- goldendict-1.5.0~git20131003/epwing_charmap.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/epwing_charmap.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,30 @@
+#ifndef __EPWING_CHARMAP_HH_INCLUDED_
+#define __EPWING_CHARMAP_HH_INCLUDED_
+
+#include <QString>
+#include <QByteArray>
+#include <QMap>
+
+namespace Epwing {
+
+class EpwingCharmap
+{
+public:
+
+  /// The class is a singleton.
+  static EpwingCharmap & instance();
+
+  /// Map Epwing extra char to Utf-8
+  QByteArray mapToUtf8( QString const & code );
+
+private:
+  EpwingCharmap();
+
+  void addEntry( QString const & code, QChar ch );
+
+  QMap< QString, QChar > charMap;
+};
+
+}
+
+#endif // __EPWING_CHARMAP_HH_INCLUDED_
diff -Nru goldendict-1.5.0~git20131003/epwing.hh goldendict-1.5.0~git20150923/epwing.hh
--- goldendict-1.5.0~git20131003/epwing.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/epwing.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef __EPWING_HH__INCLUDED__
+#define __EPWING_HH__INCLUDED__
+
+#include "dictionary.hh"
+
+/// Support for the Epwing dictionaries.
+namespace Epwing {
+
+using std::vector;
+using std::string;
+
+vector< sptr< Dictionary::Class > > makeDictionaries(
+                                      vector< string > const & fileNames,
+                                      string const & indicesDir,
+                                      Dictionary::Initializing & )
+    throw( std::exception );
+}
+
+#endif // __EPWING_HH__INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/externalviewer.cc goldendict-1.5.0~git20150923/externalviewer.cc
--- goldendict-1.5.0~git20131003/externalviewer.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/externalviewer.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,7 +4,7 @@
 #include <QDir>
 #include "externalviewer.hh"
 #include "parsecmdline.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 using std::vector;
 
@@ -29,7 +29,7 @@
 
   tempFile.close();
 
-  DPRINTF( "%s\n", tempFile.fileName().toLocal8Bit().data() );
+  GD_DPRINTF( "%s\n", tempFile.fileName().toLocal8Bit().data() );
 }
 
 void ExternalViewer::start() throw( exCantRunViewer )
diff -Nru goldendict-1.5.0~git20131003/ffmpegaudio.cc goldendict-1.5.0~git20150923/ffmpegaudio.cc
--- goldendict-1.5.0~git20131003/ffmpegaudio.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/ffmpegaudio.cc	2015-09-23 08:26:24.000000000 +0000
@@ -348,12 +348,21 @@
   {
     if ( packet.stream_index == audioStream_->index )
     {
+      AVPacket pack = packet;
       int gotFrame = 0;
-      avcodec_decode_audio4( codecContext_, frame, &gotFrame, &packet );
-      if ( !isCancelled_ && gotFrame )
+      do
       {
-        playFrame( frame );
+        int len = avcodec_decode_audio4( codecContext_, frame, &gotFrame, &pack );
+        if ( !isCancelled_ && gotFrame )
+        {
+          playFrame( frame );
+        }
+        if( len <= 0 || isCancelled_ )
+          break;
+        pack.size -= len;
+        pack.data += len;
       }
+      while( pack.size > 0 );
     }
     // av_free_packet() must be called after each call to av_read_frame()
     av_free_packet( &packet );
diff -Nru goldendict-1.5.0~git20131003/file.cc goldendict-1.5.0~git20150923/file.cc
--- goldendict-1.5.0~git20131003/file.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/file.cc	2015-09-23 08:26:24.000000000 +0000
@@ -18,6 +18,7 @@
 #endif
 
 #include "ufile.hh"
+#include "fsencoding.hh"
 
 namespace File {
 
@@ -69,9 +70,31 @@
 
 void Class::open( char const * filename, char const * mode ) throw( exCantOpen )
 {
-  f = gd_fopen( filename, mode );
+  QFile::OpenMode openMode = QIODevice::Text;
+  const char * pch = mode;
+  while( *pch )
+  {
+    switch( *pch )
+    {
+      case 'r': openMode |= QIODevice::ReadOnly;
+                break;
+      case 'w': openMode |= QIODevice::WriteOnly;
+                break;
+      case '+': openMode &= ~( QIODevice::ReadOnly | QIODevice::WriteOnly );
+                openMode |= QIODevice::ReadWrite;
+                break;
+      case 'a': openMode |= QIODevice::Append;
+                break;
+      case 'b': openMode &= ~QIODevice::Text;
+                break;
+      default:  break;
+    }
+    ++pch;
+  }
 
-  if ( !f )
+  f.setFileName( FsEncoding::decode( filename ) );
+
+  if ( !f.open( openMode ) )
     throw exCantOpen( std::string( filename ) + ": " + strerror( errno ) );
 }
 
@@ -87,7 +110,7 @@
   open( filename.c_str(), mode );
 }
 
-void Class::read( void * buf, size_t size ) throw( exReadError, exWriteError )
+void Class::read( void * buf, qint64 size ) throw( exReadError, exWriteError )
 {
   if ( !size )
     return;
@@ -95,21 +118,22 @@
   if ( writeBuffer )
     flushWriteBuffer();
 
-  size_t result = fread( buf, size, 1, f );
+  qint64 result = f.read( reinterpret_cast<char *>( buf ), size );
 
-  if ( result != 1 )
+  if ( result != size )
     throw exReadError();
 }
 
-size_t Class::readRecords( void * buf, size_t size, size_t count ) throw( exWriteError )
+size_t Class::readRecords( void * buf, qint64 size, size_t count ) throw( exWriteError )
 {
   if ( writeBuffer )
     flushWriteBuffer();
 
-  return fread( buf, size, count, f );
+  qint64 result = f.read( reinterpret_cast<char *>( buf ), size * count );
+  return result < 0 ? result : result / size;
 }
 
-void Class::write( void const * buf, size_t size ) throw( exWriteError )
+void Class::write( void const * buf, qint64 size ) throw( exWriteError, exAllocation )
 {
   if ( !size )
     return;
@@ -119,9 +143,9 @@
     // If the write is large, there's not much point in buffering
     flushWriteBuffer();
 
-    size_t result = fwrite( buf, size, 1, f );
+    qint64 result = f.write( reinterpret_cast<char const *>( buf ), size );
 
-    if ( result != 1 )
+    if ( result != size )
       throw exWriteError();
 
     return;
@@ -131,6 +155,8 @@
   {
     // Allocate the writing buffer since we don't have any yet
     writeBuffer = new char[ WriteBufferSize ];
+    if( !writeBuffer )
+      throw exAllocation();
     writeBufferLeft = WriteBufferSize;
   }
 
@@ -154,12 +180,13 @@
   }
 }
 
-size_t Class::writeRecords( void const * buf, size_t size, size_t count )
+size_t Class::writeRecords( void const * buf, qint64 size, size_t count )
   throw( exWriteError )
 {
   flushWriteBuffer();
 
-  return fwrite( buf, size, count, f );
+  qint64 result = f.write( reinterpret_cast<const char *>( buf ), size * count );
+  return result < 0 ? result : result / size;
 }
 
 char * Class::gets( char * s, int size, bool stripNl )
@@ -168,11 +195,11 @@
   if ( writeBuffer )
     flushWriteBuffer();
 
-  char * result = fgets( s, size, f );
+  qint64 len = f.readLine( s, size );
+  char * result = len > 0 ? s : NULL;
 
   if ( result && stripNl )
   {
-    size_t len = strlen( result );
     
     char * last = result + len;
 
@@ -205,7 +232,7 @@
   if ( writeBuffer )
     flushWriteBuffer();
 
-  if ( fseek( f, offset, SEEK_SET ) != 0 )
+  if ( !f.seek( offset ) )
     throw exSeekError();
 }
 
@@ -214,7 +241,7 @@
   if ( writeBuffer )
     flushWriteBuffer();
 
-  if ( fseek( f, offset, SEEK_CUR ) != 0 )
+  if( !f.seek( f.pos() + offset ) )
     throw exSeekError();
 }
 
@@ -223,7 +250,7 @@
   if ( writeBuffer )
     flushWriteBuffer();
 
-  if ( fseek( f, offset, SEEK_END ) != 0 )
+  if( !f.seek( f.size() + offset ) )
     throw exSeekError();
 }
 
@@ -234,7 +261,7 @@
 
 size_t Class::tell() throw( exSeekError )
 {
-  long result = ftell( f );
+  qint64 result = f.pos();
 
   if ( result == -1 )
     throw exSeekError();
@@ -250,35 +277,25 @@
   if ( writeBuffer )
     flushWriteBuffer();
 
-  return feof( f ) != 0;
+  return f.atEnd();
 }
 
-FILE * Class::file() throw( exWriteError )
+QFile & Class::file() throw( exWriteError )
 {
   flushWriteBuffer();
 
   return f;
 }
 
-FILE * Class::release() throw( exWriteError )
-{
-  releaseWriteBuffer();
-
-  FILE * c = f;
-
-  f = 0;
-
-  return c;
-}
-
 void Class::close() throw( exWriteError )
 {
-  fclose( release() );
+  releaseWriteBuffer();
+  f.close();
 }
 
 Class::~Class() throw()
 {
-  if ( f )
+  if ( f.isOpen() )
   {
     try
     {
@@ -287,7 +304,7 @@
     catch( exWriteError & )
     {
     }
-    fclose( f );
+    f.close();
   }
 }
 
@@ -295,9 +312,9 @@
 {
   if ( writeBuffer && writeBufferLeft != WriteBufferSize )
   {
-    size_t result = fwrite( writeBuffer, WriteBufferSize - writeBufferLeft, 1, f );
+    qint64 result = f.write( writeBuffer, WriteBufferSize - writeBufferLeft );
 
-    if ( result != 1 )
+    if ( result != WriteBufferSize - writeBufferLeft )
       throw exWriteError();
 
     writeBufferLeft = WriteBufferSize;
diff -Nru goldendict-1.5.0~git20131003/file.hh goldendict-1.5.0~git20150923/file.hh
--- goldendict-1.5.0~git20131003/file.hh	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/file.hh	2015-09-23 08:26:24.000000000 +0000
@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <string>
 #include <vector>
+#include <QFile>
 #include "ex.hh"
 
 /// A simple wrapper over FILE * operations with added write-buffering,
@@ -19,6 +20,7 @@
 DEF_EX( exReadError, "Error reading from the file", Ex )
 DEF_EX( exWriteError, "Error writing to the file", Ex )
 DEF_EX( exSeekError, "File seek error", Ex )
+DEF_EX( exAllocation, "Memory allocation error", Ex )
 
 /// Checks if the file exists or not.
 
@@ -33,9 +35,9 @@
 
 class Class
 {
-  FILE * f;
+  QFile f;
   char * writeBuffer;
-  size_t writeBufferLeft;
+  qint64 writeBufferLeft;
 
   void open( char const * filename, char const * mode ) throw( exCantOpen );
 
@@ -47,7 +49,7 @@
 
   /// Reads the number of bytes to the buffer, throws an error if it
   /// failed to fill the whole buffer (short read, i/o error etc).
-  void read( void * buf, size_t size ) throw( exReadError, exWriteError );
+  void read( void * buf, qint64 size ) throw( exReadError, exWriteError );
 
   template< typename T >
   void read( T & value ) throw( exReadError, exWriteError )
@@ -59,7 +61,7 @@
 
   /// Attempts reading at most 'count' records sized 'size'. Returns
   /// the number of records it managed to read, up to 'count'.
-  size_t readRecords( void * buf, size_t size, size_t count ) throw( exWriteError );
+  size_t readRecords( void * buf, qint64 size, size_t count ) throw( exWriteError );
 
   /// Writes the number of bytes from the buffer, throws an error if it
   /// failed to write the whole buffer (short write, i/o error etc).
@@ -67,7 +69,7 @@
   /// end up on disk immediately, or a short write may occur later
   /// than it really did. If you don't want write buffering, use
   /// writeRecords() function instead.
-  void write( void const * buf, size_t size ) throw( exWriteError );
+  void write( void const * buf, qint64 size ) throw( exWriteError, exAllocation );
 
   template< typename T >
   void write( T const & value ) throw( exWriteError )
@@ -77,7 +79,7 @@
   /// the number of records it managed to write, up to 'count'.
   /// This function does not employ buffering, but flushes the buffer if it
   /// was used before.
-  size_t writeRecords( void const * buf, size_t size, size_t count )
+  size_t writeRecords( void const * buf, qint64 size, size_t count )
     throw( exWriteError );
 
   /// Reads a string from the file. Unlike the normal fgets(), this one
@@ -107,11 +109,7 @@
 
   /// Returns the underlying FILE * record, so other operations can be
   /// performed on it.
-  FILE * file() throw( exWriteError );
-
-  /// Releases the file handle out of the control of the class. No further
-  /// operations are valid. The file will not be closed on destruction.
-  FILE * release() throw( exWriteError );
+  QFile & file() throw( exWriteError );
 
   /// Closes the file. No further operations are valid.
   void close() throw( exWriteError );
diff -Nru goldendict-1.5.0~git20131003/folding.cc goldendict-1.5.0~git20150923/folding.cc
--- goldendict-1.5.0~git20131003/folding.cc	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/folding.cc	2015-09-23 08:26:24.000000000 +0000
@@ -2,6 +2,7 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "folding.hh"
+#include <QRegExp>
 
 namespace Folding {
 
@@ -25,7 +26,7 @@
   }
 }
 
-wstring apply( wstring const & in )
+wstring apply( wstring const & in, bool preserveWildcards )
 {
   // First, strip diacritics and apply ws/punctuation removal
 
@@ -41,7 +42,12 @@
   {
     wchar ch = foldDiacritic( nextChar, left, consumed );
 
-    if ( !isCombiningMark( ch ) && !isWhitespace( ch ) && !isPunct( ch ) )
+    if ( !isCombiningMark( ch ) && !isWhitespace( ch )
+         && ( !isPunct( ch )
+              || ( preserveWildcards &&
+                   ( ch == '\\' || ch == '?' || ch == '*' || ch == '[' || ch == ']' ) )
+            )
+    )
       withoutDiacritics.push_back( ch );
 
     nextChar += consumed;
@@ -659,4 +665,18 @@
   }
 }
 
+QString escapeWildcardSymbols( const QString & str )
+{
+  QString escaped( str );
+  escaped.replace( QRegExp( "([\\[\\]\\?\\*])", Qt::CaseInsensitive ), "\\\\1" );
+  return escaped;
+}
+
+QString unescapeWildcardSymbols( const QString & str )
+{
+  QString unescaped( str );
+  unescaped.replace( QRegExp( "\\\\([\\[\\]\\?\\*])", Qt::CaseInsensitive ), "\\1" );
+  return unescaped;
+}
+
 }
diff -Nru goldendict-1.5.0~git20131003/folding.hh goldendict-1.5.0~git20150923/folding.hh
--- goldendict-1.5.0~git20131003/folding.hh	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/folding.hh	2015-09-23 08:26:24.000000000 +0000
@@ -5,6 +5,7 @@
 #define __FOLDING_HH_INCLUDED__
 
 #include "wstring.hh"
+#include <QString>
 
 /// Folding provides means to translate several possible ways to write a
 /// symbol into one. This facilitates searching. Here we currently perform
@@ -28,7 +29,7 @@
 
 /// Applies the folding algorithm to each character in the given string,
 /// making another one as a result.
-wstring apply( wstring const & );
+wstring apply( wstring const &, bool preserveWildcards = false );
 
 /// Applies only simple case folding algorithm. Since many dictionaries have
 /// different case style, we interpret words differing only by case as synonyms.
@@ -78,6 +79,12 @@
 /// generation would be too slow.
 //ssize_t apply( wchar const * in, wchar * out, size_t outSize );
 
+/// Unescape all wildcard symbols (for exast search)
+QString unescapeWildcardSymbols( QString const & );
+
+/// Escape all wildcard symbols (for place word to input line)
+QString escapeWildcardSymbols( QString const & );
+
 }
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/forvo.cc goldendict-1.5.0~git20150923/forvo.cc
--- goldendict-1.5.0~git20131003/forvo.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/forvo.cc	2015-09-23 08:26:24.000000000 +0000
@@ -14,7 +14,7 @@
 #include "language.hh"
 #include "langcoder.hh"
 #include "utf8.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 namespace Forvo {
 
@@ -153,7 +153,7 @@
 void ForvoArticleRequest::addQuery( QNetworkAccessManager & mgr,
                                     wstring const & str )
 {
-  qDebug() << "Forvo: requesting article" << gd::toQString( str );
+  gdDebug( "Forvo: requesting article %s\n", gd::toQString( str ).toUtf8().data() );
 
   QString key;
 
@@ -181,7 +181,7 @@
 
 void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 {
-  DPRINTF( "Finished.\n" );
+  GD_DPRINTF( "Finished.\n" );
 
   if ( isFinished() ) // Was cancelled
     return;
@@ -350,7 +350,7 @@
           setErrorString( text );
         }
       }
-      DPRINTF( "done.\n" );
+      GD_DPRINTF( "done.\n" );
     }
     else
       setErrorString( netReply->errorString() );
diff -Nru goldendict-1.5.0~git20131003/ftshelpers.cc goldendict-1.5.0~git20150923/ftshelpers.cc
--- goldendict-1.5.0~git20131003/ftshelpers.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/ftshelpers.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,856 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "fulltextsearch.hh"
+#include "ftshelpers.hh"
+#include "wstring_qt.hh"
+#include "file.hh"
+#include "gddebug.hh"
+
+#include <vector>
+#include <string>
+
+using std::vector;
+using std::string;
+
+DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
+
+namespace FtsHelpers
+{
+
+bool ftsIndexIsOldOrBad( string const & indexFile,
+                         BtreeIndexing::BtreeDictionary * dict )
+{
+  File::Class idx( indexFile, "rb" );
+
+  FtsIdxHeader header;
+
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
+         header.signature != FtsSignature ||
+         header.formatVersion != CurrentFtsFormatVersion + dict->getFtsIndexVersion();
+}
+
+bool parseSearchString( QString const & str, QStringList & indexWords,
+                        QStringList & searchWords,
+                        QRegExp & searchRegExp, int searchMode,
+                        bool matchCase,
+                        int distanceBetweenWords,
+                        bool & hasCJK )
+{
+  searchWords.clear();
+  indexWords.clear();
+  QRegExp spacesRegExp( "\\W+" );
+  QRegExp wordRegExp( QString( "\\w{" ) + QString::number( FTS::MinimumWordSize ) + ",}" );
+  QRegExp setsRegExp( "\\[[^\\]]+\\]", Qt::CaseInsensitive, QRegExp::RegExp2 );
+
+  hasCJK = false;
+  for( int x = 0; x < str.size(); x++ )
+    if( isCJKChar( str.at( x ).unicode() ) )
+    {
+      hasCJK = true;
+      break;
+    }
+
+  if( searchMode == FTS::WholeWords || searchMode == FTS::PlainText )
+  {
+    if( hasCJK )
+      return false;
+
+    // Make words list for search in article text
+    searchWords = str.normalized( QString::NormalizationForm_C )
+                     .split( spacesRegExp, QString::SkipEmptyParts );
+
+    // Make words list for index search
+    QStringList list = str.normalized( QString::NormalizationForm_C )
+                          .toLower().split( spacesRegExp, QString::SkipEmptyParts );
+    indexWords = list.filter( wordRegExp );
+    indexWords.removeDuplicates();
+
+    // Make regexp for results hilite
+
+    QStringList allWords = str.split( spacesRegExp, QString::SkipEmptyParts );
+    QString searchString( "(" );
+
+    QString stripWords( "(?:\\W+\\w+){0," );
+    if( distanceBetweenWords >= 0 )
+      stripWords += QString::number( distanceBetweenWords );
+    stripWords += "}\\W+";
+
+    QString boundWord( searchMode == FTS::WholeWords ? "\\b" : "(?:\\w*)");
+
+    for( int x = 0; x < allWords.size(); x++ )
+    {
+      if( x )
+        searchString += stripWords;
+
+      searchString += boundWord + allWords[ x ] + boundWord;
+    }
+
+    searchString += ")";
+
+    searchRegExp = QRegExp( searchString, matchCase ? Qt::CaseSensitive : Qt::CaseInsensitive,
+                            QRegExp::RegExp2 );
+    searchRegExp.setMinimal( true );
+
+    return !indexWords.isEmpty();
+  }
+  else
+  {
+    // Make words list for index search
+
+    QString tmp = str;
+
+    // Remove all symbol sets
+    tmp.replace( setsRegExp, " " );
+
+    QStringList list = tmp.normalized( QString::NormalizationForm_C )
+                          .toLower().split( spacesRegExp, QString::SkipEmptyParts );
+
+    if( hasCJK )
+    {
+      QStringList wordList, hieroglyphList;
+      for( int i = 0; i < list.size(); i ++ )
+      {
+        QString word = list.at( i );
+
+        // Check for CJK symbols in word
+        bool parsed = false;
+        QString hieroglyph;
+        for( int x = 0; x < word.size(); x++ )
+          if( isCJKChar( word.at( x ).unicode() ) )
+          {
+            parsed = true;
+            hieroglyph.append( word[ x ] );
+
+            if( QChar( word.at( x ) ).isHighSurrogate()
+                &&  QChar( word[ x + 1 ] ).isLowSurrogate() )
+              hieroglyph.append( word[ ++x ] );
+
+            hieroglyphList.append( hieroglyph );
+            hieroglyph.clear();
+          }
+
+        // If word don't contains CJK symbols put it in list as is
+        if( !parsed )
+          wordList.append( word );
+      }
+
+      indexWords = wordList.filter( wordRegExp );
+      indexWords.removeDuplicates();
+
+      hieroglyphList.removeDuplicates();
+      indexWords += hieroglyphList;
+    }
+    else
+    {
+      indexWords = list.filter( wordRegExp );
+      indexWords.removeDuplicates();
+    }
+
+    searchRegExp = QRegExp( str, matchCase ? Qt::CaseSensitive : Qt::CaseInsensitive,
+                            searchMode == FTS::Wildcards ? QRegExp::WildcardUnix : QRegExp::RegExp2 );
+    searchRegExp.setMinimal( true );
+  }
+
+  return true;
+}
+
+void parseArticleForFts( uint32_t articleAddress, QString & articleText,
+                         QMap< QString, QVector< uint32_t > > & words )
+{
+  if( articleText.isEmpty() )
+    return;
+
+  QStringList articleWords = articleText.normalized( QString::NormalizationForm_C )
+                                        .split( QRegExp( "\\W+" ), QString::SkipEmptyParts );
+  QSet< QString > setOfWords;
+
+  for( int x = 0; x < articleWords.size(); x++ )
+  {
+    QString word = articleWords.at( x ).toLower();
+
+    bool hasCJK = false;
+    QString hieroglyph;
+
+    // If word contains CJK symbols we add to index only these symbols separately
+    for( int y = 0; y < word.size(); y++ )
+      if( isCJKChar( word.at( y ).unicode() ) )
+      {
+        hasCJK = true;
+        hieroglyph.append( word[ y ] );
+
+        if( QChar( word.at( y ) ).isHighSurrogate()
+            &&  QChar( word[ y + 1 ] ).isLowSurrogate() )
+          hieroglyph.append( word[ ++y ] );
+
+        if( !setOfWords.contains( hieroglyph ) )
+        {
+          setOfWords.insert( hieroglyph );
+          words[ hieroglyph ].push_back( articleAddress );
+        }
+
+        hieroglyph.clear();
+      }
+
+    if( !hasCJK )
+    {
+      // Else we add word to index as is
+      if( word.size() < FTS::MinimumWordSize )
+        continue;
+
+      if( !setOfWords.contains( word ) )
+      {
+        setOfWords.insert( word );
+        words[ word ].push_back( articleAddress );
+      }
+    }
+  }
+}
+
+void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancelled )
+{
+  Mutex::Lock _( dict->getFtsMutex() );
+
+  if( isCancelled )
+    throw exUserAbort();
+
+  File::Class ftsIdx( dict->ftsIndexName(), "wb" );
+
+  FtsIdxHeader ftsIdxHeader;
+  memset( &ftsIdxHeader, 0, sizeof( ftsIdxHeader ) );
+
+  // We write a dummy header first. At the end of the process the header
+  // will be rewritten with the right values.
+
+  ftsIdx.write( ftsIdxHeader );
+
+  ChunkedStorage::Writer chunks( ftsIdx );
+
+  BtreeIndexing::IndexedWords indexedWords;
+
+  QSet< uint32_t > setOfOffsets;
+
+  dict->findArticleLinks( 0, &setOfOffsets, 0, &isCancelled );
+
+  if( isCancelled )
+    throw exUserAbort();
+
+  QVector< uint32_t > offsets;
+  offsets.resize( setOfOffsets.size() );
+  uint32_t * ptr = &offsets.front();
+
+  for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+       it != setOfOffsets.constEnd(); ++it )
+  {
+    *ptr = *it;
+    ptr++;
+  }
+
+  // Free memory
+  setOfOffsets.clear();
+
+  if( isCancelled )
+    throw exUserAbort();
+
+  qSort( offsets );
+
+  QMap< QString, QVector< uint32_t > > ftsWords;
+
+  // index articles for full-text search
+  for( int i = 0; i < offsets.size(); i++ )
+  {
+    if( isCancelled )
+      throw exUserAbort();
+
+    QString headword, articleStr;
+
+    dict->getArticleText( offsets.at( i ), headword, articleStr );
+
+    parseArticleForFts( offsets.at( i ), articleStr, ftsWords );
+  }
+
+  // Free memory
+  offsets.clear();
+
+  QMap< QString, QVector< uint32_t > >::iterator it = ftsWords.begin();
+  while( it != ftsWords.end() )
+  {
+    if( isCancelled )
+      throw exUserAbort();
+
+    uint32_t offset = chunks.startNewBlock();
+    uint32_t size = it.value().size();
+
+    chunks.addToBlock( &size, sizeof(uint32_t) );
+    chunks.addToBlock( it.value().data(), size * sizeof(uint32_t) );
+
+    indexedWords.addSingleWord( gd::toWString( it.key() ), offset );
+
+    it = ftsWords.erase( it );
+  }
+
+  ftsIdxHeader.chunksOffset = chunks.finish();
+  ftsIdxHeader.wordCount = indexedWords.size();
+
+  if( isCancelled )
+    throw exUserAbort();
+
+  BtreeIndexing::IndexInfo ftsIdxInfo = BtreeIndexing::buildIndex( indexedWords, ftsIdx );
+
+  // Free memory
+  indexedWords.clear();
+
+  ftsIdxHeader.indexBtreeMaxElements = ftsIdxInfo.btreeMaxElements;
+  ftsIdxHeader.indexRootOffset = ftsIdxInfo.rootOffset;
+
+  ftsIdxHeader.signature = FtsHelpers::FtsSignature;
+  ftsIdxHeader.formatVersion = FtsHelpers::CurrentFtsFormatVersion + dict->getFtsIndexVersion();
+
+  ftsIdx.rewind();
+  ftsIdx.writeRecords( &ftsIdxHeader, sizeof(ftsIdxHeader), 1 );
+}
+
+bool isCJKChar( ushort ch )
+{
+  if( ( ch >= 0x3400 && ch <= 0x9FFF )
+      || ( ch >= 0xF900 && ch <= 0xFAFF )
+      || ( ch >= 0xD800 && ch <= 0xDFFF ) )
+    return true;
+
+  return false;
+}
+
+void FTSResultsRequestRunnable::run()
+{
+  r.run();
+}
+
+void FTSResultsRequest::checkArticles( QVector< uint32_t > const & offsets,
+                                       QStringList const & words,
+                                       QRegExp const & searchRegexp )
+{
+  int results = 0;
+  QString headword, articleText;
+  QList< uint32_t > offsetsForHeadwords;
+
+  QString id = QString::fromUtf8( dict.getId().c_str() );
+
+  if( searchMode == FTS::Wildcards || searchMode == FTS::RegExp )
+  {
+    // RegExp mode
+
+    for( int i = 0; i < offsets.size(); i++ )
+    {
+      if( isCancelled )
+        break;
+
+      dict.getArticleText( offsets.at( i ), headword, articleText );
+
+      if( articleText.contains( searchRegexp ) )
+      {
+        if( headword.isEmpty() )
+          offsetsForHeadwords.append( offsets.at( i ) );
+        else
+          foundHeadwords->append( FTS::FtsHeadword( headword, id ) );
+
+        results++;
+        if( maxResults > 0 && results >= maxResults )
+          break;
+      }
+    }
+  }
+  else
+  {
+    // Words mode
+
+    QRegExp regex( "\\b\\w+\\b" );
+    Qt::CaseSensitivity cs = matchCase ? Qt::CaseSensitive : Qt::CaseInsensitive;
+
+    for( int i = 0; i < offsets.size(); i++ )
+    {
+      if( isCancelled )
+        break;
+
+      int pos = 0;
+      int matchWordNom = 0;
+      int unmatchWordNom = 0;
+
+      dict.getArticleText( offsets.at( i ), headword, articleText );
+
+      int articleLength = articleText.length();
+      while ( pos >= 0 && pos < articleLength )
+      {
+        pos = articleText.indexOf( regex, pos );
+        if( pos >= 0 )
+        {
+          QString s = regex.cap().normalized( QString::NormalizationForm_C );
+          if( ( searchMode == FTS::WholeWords && s.compare( words.at( matchWordNom ), cs ) == 0 )
+              || ( searchMode == FTS::PlainText && s.contains( words.at( matchWordNom ), cs ) ) )
+          {
+            matchWordNom += 1;
+
+            if( matchWordNom >= words.size() )
+              break;  // All words are found
+
+            unmatchWordNom = 0;
+          }
+          else
+          if( matchWordNom > 0 )
+          {
+            unmatchWordNom += 1;
+            if( distanceBetweenWords >= 0 && unmatchWordNom > distanceBetweenWords )
+            {
+              matchWordNom = 0;
+              unmatchWordNom = 0;
+            }
+          }
+          pos += s.isEmpty() ? 1 : s.length();
+        }
+      }
+
+      if( matchWordNom >= words.size() )
+      {
+        if( headword.isEmpty() )
+          offsetsForHeadwords.append( offsets.at( i ) );
+        else
+          foundHeadwords->append( FTS::FtsHeadword( headword, id ) );
+
+        results++;
+        if( maxResults > 0 && results >= maxResults )
+          break;
+      }
+    }
+  }
+  if( !offsetsForHeadwords.isEmpty() )
+  {
+    QVector< QString > headwords;
+    dict.getHeadwordsFromOffsets( offsetsForHeadwords, headwords, &isCancelled );
+    for( int x = 0; x < headwords.size(); x++ )
+      foundHeadwords->append( FTS::FtsHeadword( headwords.at( x ), id ) );
+  }
+}
+
+void FTSResultsRequest::indexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
+                                     sptr< ChunkedStorage::Reader > chunks,
+                                     QStringList & indexWords,
+                                     QStringList & searchWords )
+{
+  // Find articles which contains all requested words
+
+  vector< BtreeIndexing::WordArticleLink > links;
+  QSet< uint32_t > setOfOffsets, tmp;
+  uint32_t size;
+
+  if( indexWords.isEmpty() )
+    return;
+
+  int n = indexWords.length();
+  for( int i = 0; i < n; i++ )
+  {
+    if( isCancelled )
+      return;
+
+    tmp.clear();
+
+    links = ftsIndex.findArticles( gd::toWString( indexWords.at( i ) ) );
+    for( unsigned x = 0; x < links.size(); x++ )
+    {
+
+      if( isCancelled )
+        return;
+
+      vector< char > chunk;
+      char * linksPtr;
+      {
+        Mutex::Lock _( dict.getFtsMutex() );
+        linksPtr = chunks->getBlock( links[ x ].articleOffset, chunk );
+      }
+
+      memcpy( &size, linksPtr, sizeof(uint32_t) );
+      linksPtr += sizeof(uint32_t);
+      for( uint32_t y = 0; y < size; y++ )
+      {
+        tmp.insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) );
+        linksPtr += sizeof(uint32_t);
+      }
+    }
+
+    links.clear();
+
+    if( i == 0 )
+      setOfOffsets = tmp;
+    else
+      setOfOffsets = setOfOffsets.intersect( tmp );
+  }
+
+  tmp.clear();
+
+  if( setOfOffsets.isEmpty() )
+    return;
+
+  QVector< uint32_t > offsets;
+  offsets.resize( setOfOffsets.size() );
+  uint32_t * ptr = &offsets.front();
+
+  for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+       it != setOfOffsets.constEnd(); ++it )
+  {
+    *ptr = *it;
+    ptr++;
+  }
+
+  setOfOffsets.clear();
+
+  qSort( offsets );
+
+  checkArticles( offsets, searchWords );
+}
+
+void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
+                                             sptr< ChunkedStorage::Reader > chunks,
+                                             QStringList & indexWords,
+                                             QStringList & searchWords,
+                                             QRegExp & regexp )
+{
+  // Special case - combination of index search for hieroglyphs
+  // and full index search for other words
+
+  QSet< uint32_t > setOfOffsets;
+  uint32_t size;
+
+  if( isCancelled )
+    return;
+
+  if( indexWords.isEmpty() )
+    return;
+
+  QStringList wordsList, hieroglyphsList;
+
+  for( int x = 0; x < indexWords.size(); x++ )
+  {
+    QString const & word = indexWords.at( x );
+    if( isCJKChar( word[ 0 ].unicode() ) )
+      hieroglyphsList.append( word );
+    else
+      wordsList.append( word );
+  }
+
+  QVector< QSet< uint32_t > > allWordsLinks;
+
+  int n = wordsList.size();
+  if( !hieroglyphsList.isEmpty() )
+    n += 1;
+
+  allWordsLinks.resize( n );
+  int wordNom = 0;
+
+  if( !hieroglyphsList.empty() )
+  {
+    QSet< uint32_t > tmp;
+    vector< BtreeIndexing::WordArticleLink > links;
+
+    for( int i = 0; i < hieroglyphsList.size(); i++ )
+    {
+      links = ftsIndex.findArticles( gd::toWString( hieroglyphsList.at( i ) ) );
+      for( unsigned x = 0; x < links.size(); x++ )
+      {
+
+        if( isCancelled )
+          return;
+
+        vector< char > chunk;
+        char * linksPtr;
+        {
+          Mutex::Lock _( dict.getFtsMutex() );
+          linksPtr = chunks->getBlock( links[ x ].articleOffset, chunk );
+        }
+
+        memcpy( &size, linksPtr, sizeof(uint32_t) );
+        linksPtr += sizeof(uint32_t);
+        for( uint32_t y = 0; y < size; y++ )
+        {
+          tmp.insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) );
+          linksPtr += sizeof(uint32_t);
+        }
+      }
+
+      links.clear();
+
+      if( i == 0 )
+        setOfOffsets = tmp;
+      else
+        setOfOffsets = setOfOffsets.intersect( tmp );
+    }
+
+    allWordsLinks[ wordNom ] = setOfOffsets;
+    setOfOffsets.clear();
+    wordNom += 1;
+  }
+
+  if( !wordsList.isEmpty() )
+  {
+    QVector< BtreeIndexing::WordArticleLink > links;
+    ftsIndex.findArticleLinks( &links, 0, 0 );
+
+    for( int x = 0; x < links.size(); x++ )
+    {
+      if( isCancelled )
+        return;
+
+      QString word = QString::fromUtf8( links[ x ].word.data(), links[ x ].word.size() );
+      for( int i = 0; i < wordsList.size(); i++ )
+      {
+        if( word.length() >= wordsList.at( i ).length() && word.contains( wordsList.at( i ) ) )
+        {
+          vector< char > chunk;
+          char * linksPtr;
+          {
+            Mutex::Lock _( dict.getFtsMutex() );
+            linksPtr = chunks->getBlock( links[ x ].articleOffset, chunk );
+          }
+
+          memcpy( &size, linksPtr, sizeof(uint32_t) );
+          linksPtr += sizeof(uint32_t);
+          for( uint32_t y = 0; y < size; y++ )
+          {
+            allWordsLinks[ wordNom ].insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) );
+            linksPtr += sizeof(uint32_t);
+          }
+          wordNom += 1;
+          break;
+        }
+      }
+    }
+
+    links.clear();
+  }
+
+  for( int i = 0; i < allWordsLinks.size(); i++ )
+  {
+    if( i == 0 )
+      setOfOffsets = allWordsLinks.at( i );
+    else
+      setOfOffsets = setOfOffsets.intersect( allWordsLinks.at( i ) );
+  }
+
+  if( setOfOffsets.isEmpty() )
+    return;
+
+  allWordsLinks.clear();
+
+  QVector< uint32_t > offsets;
+  offsets.resize( setOfOffsets.size() );
+  uint32_t * ptr = &offsets.front();
+
+  for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+       it != setOfOffsets.constEnd(); ++it )
+  {
+    *ptr = *it;
+    ptr++;
+  }
+
+  setOfOffsets.clear();
+
+  qSort( offsets );
+
+  checkArticles( offsets, searchWords, regexp );
+}
+
+void FTSResultsRequest::fullIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
+                                         sptr< ChunkedStorage::Reader > chunks,
+                                         QStringList & indexWords,
+                                         QStringList & searchWords,
+                                         QRegExp & regexp )
+{
+  QSet< uint32_t > setOfOffsets;
+  uint32_t size;
+  QVector< BtreeIndexing::WordArticleLink > links;
+
+  if( isCancelled )
+    return;
+
+  if( indexWords.isEmpty() )
+    return;
+
+  ftsIndex.findArticleLinks( &links, 0, 0 );
+
+  QVector< QSet< uint32_t > > allWordsLinks;
+  allWordsLinks.resize( indexWords.size() );
+
+  for( int x = 0; x < links.size(); x++ )
+  {
+    if( isCancelled )
+      return;
+
+    QString word = QString::fromUtf8( links[ x ].word.data(), links[ x ].word.size() );
+    for( int i = 0; i < indexWords.size(); i++ )
+    {
+      if( word.length() >= indexWords.at( i ).length() && word.contains( indexWords.at( i ) ) )
+      {
+        vector< char > chunk;
+        char * linksPtr;
+        {
+          Mutex::Lock _( dict.getFtsMutex() );
+          linksPtr = chunks->getBlock( links[ x ].articleOffset, chunk );
+        }
+
+        memcpy( &size, linksPtr, sizeof(uint32_t) );
+        linksPtr += sizeof(uint32_t);
+        for( uint32_t y = 0; y < size; y++ )
+        {
+          allWordsLinks[ i ].insert( *( reinterpret_cast< uint32_t * >( linksPtr ) ) );
+          linksPtr += sizeof(uint32_t);
+        }
+        break;
+      }
+    }
+  }
+
+  links.clear();
+
+  for( int i = 0; i < allWordsLinks.size(); i++ )
+  {
+    if( i == 0 )
+      setOfOffsets = allWordsLinks.at( i );
+    else
+      setOfOffsets = setOfOffsets.intersect( allWordsLinks.at( i ) );
+  }
+
+  if( setOfOffsets.isEmpty() )
+    return;
+
+  allWordsLinks.clear();
+
+  QVector< uint32_t > offsets;
+  offsets.resize( setOfOffsets.size() );
+  uint32_t * ptr = &offsets.front();
+
+  for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+       it != setOfOffsets.constEnd(); ++it )
+  {
+    *ptr = *it;
+    ptr++;
+  }
+
+  setOfOffsets.clear();
+
+  qSort( offsets );
+
+  checkArticles( offsets, searchWords, regexp );
+}
+
+void FTSResultsRequest::fullSearch( QStringList & searchWords, QRegExp & regexp )
+{
+  // Whole file survey
+
+  if( isCancelled )
+    return;
+
+  QSet< uint32_t > setOfOffsets;
+  setOfOffsets.reserve( dict.getArticleCount() );
+  dict.findArticleLinks( 0, &setOfOffsets, 0 );
+
+  if( isCancelled )
+    return;
+
+  QVector< uint32_t > offsets;
+  offsets.resize( setOfOffsets.size() );
+  uint32_t * ptr = &offsets.front();
+
+  for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+       it != setOfOffsets.constEnd(); ++it )
+  {
+    *ptr = *it;
+    ptr++;
+  }
+
+  if( isCancelled )
+    return;
+
+  setOfOffsets.clear();
+
+  qSort( offsets );
+
+  if( isCancelled )
+    return;
+
+  checkArticles( offsets, searchWords, regexp );
+}
+
+void FTSResultsRequest::run()
+{
+  if ( dict.ensureInitDone().size() )
+  {
+    setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
+    finish();
+    return;
+  }
+
+  try
+  {
+    QStringList indexWords, searchWords;
+    QRegExp searchRegExp;
+
+    if( !FtsHelpers::parseSearchString( searchString, indexWords, searchWords, searchRegExp,
+                                        searchMode, matchCase, distanceBetweenWords, hasCJK ) )
+    {
+      finish();
+      return;
+    }
+
+    if( dict.haveFTSIndex() && !indexWords.isEmpty() )
+    {
+      FtsIdxHeader ftsIdxHeader;
+      BtreeIndexing::BtreeIndex ftsIndex;
+      sptr< ChunkedStorage::Reader > chunks;
+
+      File::Class ftsIdx( dict.ftsIndexName(), "rb" );
+
+      {
+        Mutex::Lock _( dict.getFtsMutex() );
+
+        ftsIdxHeader = ftsIdx.read< FtsIdxHeader >();
+
+        ftsIndex.openIndex( BtreeIndexing::IndexInfo( ftsIdxHeader.indexBtreeMaxElements,
+                                                      ftsIdxHeader.indexRootOffset ),
+                            ftsIdx, dict.getFtsMutex() );
+
+        chunks = new ChunkedStorage::Reader( ftsIdx, ftsIdxHeader.chunksOffset );
+      }
+
+      if( hasCJK )
+        combinedIndexSearch( ftsIndex, chunks, indexWords, searchWords, searchRegExp );
+      else
+      {
+        if( searchMode == FTS::WholeWords )
+          indexSearch( ftsIndex, chunks, indexWords, searchWords );
+        else
+          fullIndexSearch( ftsIndex, chunks, indexWords, searchWords, searchRegExp );
+      }
+    }
+    else
+    {
+      fullSearch( searchWords, searchRegExp );
+    }
+
+    if( foundHeadwords && foundHeadwords->size() > 0 )
+    {
+      Mutex::Lock _( dataMutex );
+      data.resize( sizeof( foundHeadwords ) );
+      memcpy( &data.front(), &foundHeadwords, sizeof( foundHeadwords ) );
+      foundHeadwords = 0;
+      hasAnyData = true;
+    }
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "FTS: Failed full-text search for \"%s\", reason: %s\n",
+               dict.getName().c_str(), ex.what() );
+    // Results not loaded -- we don't set the hasAnyData flag then
+  }
+
+  finish();
+}
+
+} // namespace
+
diff -Nru goldendict-1.5.0~git20131003/ftshelpers.hh goldendict-1.5.0~git20150923/ftshelpers.hh
--- goldendict-1.5.0~git20131003/ftshelpers.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/ftshelpers.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,157 @@
+#ifndef __FTSHELPERS_HH_INCLUDED__
+#define __FTSHELPERS_HH_INCLUDED__
+
+#include <QString>
+#include <QRegExp>
+#include <QRunnable>
+#include <QSemaphore>
+#include <QList>
+
+#include "dictionary.hh"
+#include "btreeidx.hh"
+#include "fulltextsearch.hh"
+#include "chunkedstorage.hh"
+
+#include <string>
+
+namespace FtsHelpers
+{
+
+enum
+{
+  FtsSignature = 0x58535446, // FTSX on little-endian, XSTF on big-endian
+  CurrentFtsFormatVersion = 2 + BtreeIndexing::FormatVersion,
+};
+
+#pragma pack(push,1)
+
+struct FtsIdxHeader
+{
+  uint32_t signature; // First comes the signature, FTSX
+  uint32_t formatVersion; // File format version
+  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
+  uint32_t indexRootOffset;
+  uint32_t wordCount; // Number of unique words this dictionary has
+}
+#ifndef _MSC_VER
+__attribute__((packed))
+#endif
+;
+
+#pragma pack(pop)
+
+bool ftsIndexIsOldOrBad( std::string const & indexFile,
+                         BtreeIndexing::BtreeDictionary * dict );
+
+bool parseSearchString( QString const & str, QStringList & IndexWords,
+                        QStringList & searchWords,
+                        QRegExp & searchRegExp, int searchMode,
+                        bool matchCase,
+                        int distanceBetweenWords,
+                        bool & hasCJK );
+
+void parseArticleForFts( uint32_t articleAddress, QString & articleText,
+                         QMap< QString, QVector< uint32_t > > & words );
+
+void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancelled );
+
+bool isCJKChar( ushort ch );
+
+class FTSResultsRequest;
+
+class FTSResultsRequestRunnable : public QRunnable
+{
+  FTSResultsRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  FTSResultsRequestRunnable( FTSResultsRequest & r_,
+                             QSemaphore & hasExited_ ) : r( r_ ),
+                                                         hasExited( hasExited_ )
+  {}
+
+  ~FTSResultsRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class FTSResultsRequest : public Dictionary::DataRequest
+{
+  BtreeIndexing::BtreeDictionary & dict;
+
+  QString searchString;
+  int searchMode;
+  bool matchCase;
+  int distanceBetweenWords;
+  int maxResults;
+  bool hasCJK;
+
+  QAtomicInt isCancelled;
+  QSemaphore hasExited;
+
+  QList< FTS::FtsHeadword > * foundHeadwords;
+
+  void checkArticles( QVector< uint32_t > const & offsets,
+                      QStringList const & words,
+                      QRegExp const & searchRegexp = QRegExp() );
+
+  void indexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
+                    sptr< ChunkedStorage::Reader > chunks,
+                    QStringList & indexWords,
+                    QStringList & searchWords );
+
+  void combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
+                            sptr< ChunkedStorage::Reader > chunks,
+                            QStringList & indexWords,
+                            QStringList & searchWords,
+                            QRegExp & regexp );
+
+  void fullIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
+                        sptr< ChunkedStorage::Reader > chunks,
+                        QStringList & indexWords,
+                        QStringList & searchWords,
+                        QRegExp & regexp );
+
+  void fullSearch( QStringList & searchWords, QRegExp & regexp );
+
+public:
+
+  FTSResultsRequest( BtreeIndexing::BtreeDictionary & dict_, QString const & searchString_,
+                     int searchMode_, bool matchCase_, int distanceBetweenWords_, int maxResults_ ):
+    dict( dict_ ),
+    searchString( searchString_ ),
+    searchMode( searchMode_ ),
+    matchCase( matchCase_ ),
+    distanceBetweenWords( distanceBetweenWords_ ),
+    maxResults( maxResults_ ),
+    hasCJK( false )
+  {
+    foundHeadwords = new QList< FTS::FtsHeadword >;
+    QThreadPool::globalInstance()->start(
+      new FTSResultsRequestRunnable( *this, hasExited ), -100 );
+  }
+
+  void run(); // Run from another thread by DslResourceRequestRunnable
+
+  virtual void cancel()
+  {
+    isCancelled.ref();
+  }
+
+  ~FTSResultsRequest()
+  {
+    isCancelled.ref();
+    if( foundHeadwords )
+      delete foundHeadwords;
+    hasExited.acquire();
+  }
+};
+
+} // namespace
+
+#endif // __FTSHELPERS_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/fulltextsearch.cc goldendict-1.5.0~git20150923/fulltextsearch.cc
--- goldendict-1.5.0~git20131003/fulltextsearch.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/fulltextsearch.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,599 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include "fulltextsearch.hh"
+#include "ftshelpers.hh"
+#include "gddebug.hh"
+#include "mainwindow.hh"
+
+#include <QThreadPool>
+#include <QIntValidator>
+#include <QMessageBox>
+#include <qalgorithms.h>
+
+namespace FTS
+{
+
+enum
+{
+  MinDistanceBetweenWords = 0,
+  MaxDistanceBetweenWords = 15,
+  MinArticlesPerDictionary = 1,
+  MaxArticlesPerDictionary = 10000
+};
+
+void Indexing::run()
+{
+  try
+  {
+    // First iteration - dictionaries with no more MaxDictionarySizeForFastSearch articles
+    for( size_t x = 0; x < dictionaries.size(); x++ )
+    {
+      if( isCancelled )
+        break;
+
+      if( dictionaries.at( x )->canFTS()
+          &&!dictionaries.at( x )->haveFTSIndex() )
+      {
+        emit sendNowIndexingName( QString::fromUtf8( dictionaries.at( x )->getName().c_str() ) );
+        dictionaries.at( x )->makeFTSIndex( isCancelled, true );
+      }
+    }
+
+    // Second iteration - all remaining dictionaries
+    for( size_t x = 0; x < dictionaries.size(); x++ )
+    {
+      if( isCancelled )
+        break;
+
+      if( dictionaries.at( x )->canFTS()
+          &&!dictionaries.at( x )->haveFTSIndex() )
+      {
+        emit sendNowIndexingName( QString::fromUtf8( dictionaries.at( x )->getName().c_str() ) );
+        dictionaries.at( x )->makeFTSIndex( isCancelled, false );
+      }
+    }
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Exception occured while full-text search: %s", ex.what() );
+  }
+  emit sendNowIndexingName( tr( "None" ) );
+}
+
+
+FtsIndexing::FtsIndexing( std::vector< sptr< Dictionary::Class > > const & dicts):
+  dictionaries( dicts ),
+  started( false ),
+  nowIndexing( tr( "None" ) )
+{
+}
+
+void FtsIndexing::doIndexing()
+{
+  if( started )
+    stopIndexing();
+
+  if( !started )
+  {
+    while( isCancelled )
+      isCancelled.deref();
+
+    Indexing *idx = new Indexing( isCancelled, dictionaries, indexingExited );
+
+    connect( idx, SIGNAL( sendNowIndexingName( QString ) ), this, SLOT( setNowIndexedName( QString ) ) );
+
+    QThreadPool::globalInstance()->start( idx );
+
+    started = true;
+  }
+}
+
+void FtsIndexing::stopIndexing()
+{
+  if( started )
+  {
+    if( !isCancelled )
+      isCancelled.ref();
+
+    indexingExited.acquire();
+    started = false;
+  }
+}
+
+void FtsIndexing::setNowIndexedName( QString name )
+{
+  {
+    Mutex::Lock _( nameMutex );
+    nowIndexing = name;
+  }
+  emit newIndexingName( name );
+}
+
+QString FtsIndexing::nowIndexingName()
+{
+  Mutex::Lock _( nameMutex );
+  return nowIndexing;
+}
+
+FullTextSearchDialog::FullTextSearchDialog( QWidget * parent,
+                                            Config::Class & cfg_,
+                                            std::vector< sptr< Dictionary::Class > > const & dictionaries_,
+                                            std::vector< Instances::Group > const & groups_,
+                                            FtsIndexing & ftsidx ) :
+  QDialog( parent ),
+  cfg( cfg_ ),
+  dictionaries( dictionaries_ ),
+  groups( groups_ ),
+  group( 0 ),
+  ftsIdx( ftsidx )
+, helpAction( this )
+{
+  ui.setupUi( this );
+
+  if( cfg.preferences.fts.dialogGeometry.size() > 0 )
+    restoreGeometry( cfg.preferences.fts.dialogGeometry );
+
+  setAttribute( Qt::WA_DeleteOnClose, false );
+  setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint );
+
+  setWindowTitle( tr( "Full-text search" ) );
+
+  setNewIndexingName( ftsIdx.nowIndexingName() );
+
+  connect( &ftsIdx, SIGNAL( newIndexingName( QString ) ),
+           this, SLOT( setNewIndexingName( QString ) ) );
+
+  ui.searchMode->addItem( tr( "Whole words" ), WholeWords );
+  ui.searchMode->addItem( tr( "Plain text"), PlainText );
+  ui.searchMode->addItem( tr( "Wildcards" ), Wildcards );
+  ui.searchMode->addItem( tr( "RegExp" ), RegExp );
+  ui.searchMode->setCurrentIndex( cfg.preferences.fts.searchMode );
+
+  ui.searchProgressBar->hide();
+
+  ui.checkBoxDistanceBetweenWords->setText( tr( "Max distance between words (%1-%2):" )
+                                            .arg( QString::number( MinDistanceBetweenWords ) )
+                                            .arg( QString::number( MaxDistanceBetweenWords ) ) );
+  ui.checkBoxDistanceBetweenWords->setChecked( cfg.preferences.fts.useMaxDistanceBetweenWords );
+
+  ui.distanceBetweenWords->setMinimum( MinDistanceBetweenWords );
+  ui.distanceBetweenWords->setMaximum( MaxDistanceBetweenWords );
+  ui.distanceBetweenWords->setValue( cfg.preferences.fts.maxDistanceBetweenWords );
+
+  ui.checkBoxArticlesPerDictionary->setText( tr( "Max articles per dictionary (%1-%2):" )
+                                             .arg( QString::number( MinArticlesPerDictionary ) )
+                                             .arg( QString::number( MaxArticlesPerDictionary ) ) );
+  ui.checkBoxArticlesPerDictionary->setChecked( cfg.preferences.fts.useMaxArticlesPerDictionary );
+
+  ui.articlesPerDictionary->setMinimum( MinArticlesPerDictionary );
+  ui.articlesPerDictionary->setMaximum( MaxArticlesPerDictionary );
+  ui.articlesPerDictionary->setValue( cfg.preferences.fts.maxArticlesPerDictionary );
+
+  ui.matchCase->setChecked( cfg.preferences.fts.matchCase );
+
+  setLimitsUsing();
+
+  connect( ui.checkBoxDistanceBetweenWords, SIGNAL( stateChanged( int ) ),
+           this, SLOT( setLimitsUsing() ) );
+  connect( ui.checkBoxArticlesPerDictionary, SIGNAL( stateChanged( int ) ),
+           this, SLOT( setLimitsUsing() ) );
+  connect( ui.searchMode, SIGNAL( currentIndexChanged( int ) ),
+           this, SLOT( setLimitsUsing() ) );
+
+  model = new HeadwordsListModel( this, results, activeDicts );
+  ui.headwordsView->setModel( model );
+
+  ui.articlesFoundLabel->setText( tr( "Articles found: " ) + "0" );
+
+  connect( ui.headwordsView, SIGNAL( clicked( QModelIndex ) ),
+           this, SLOT( itemClicked( QModelIndex ) ) );
+
+  connect( this, SIGNAL( finished( int ) ), this, SLOT( saveData() ) );
+
+  connect( ui.OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
+  connect( ui.cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
+
+  connect( ui.helpButton, SIGNAL( clicked() ),
+           this, SLOT( helpRequested() ) );
+
+  helpAction.setShortcut( QKeySequence( "F1" ) );
+  helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
+
+  connect( &helpAction, SIGNAL( triggered() ),
+           this, SLOT( helpRequested() ) );
+
+  addAction( &helpAction );
+
+  ui.headwordsView->installEventFilter( this );
+
+  delegate = new WordListItemDelegate( ui.headwordsView->itemDelegate() );
+  if( delegate )
+    ui.headwordsView->setItemDelegate( delegate );
+}
+
+FullTextSearchDialog::~FullTextSearchDialog()
+{
+  if( delegate )
+    delete delegate;
+}
+
+void FullTextSearchDialog::stopSearch()
+{
+  if( !searchReqs.empty() )
+  {
+    for( std::list< sptr< Dictionary::DataRequest > >::iterator it = searchReqs.begin();
+         it != searchReqs.end(); ++it )
+      if( !(*it)->isFinished() )
+        (*it)->cancel();
+
+    while( searchReqs.size() )
+      QApplication::processEvents();
+  }
+}
+
+void FullTextSearchDialog::showDictNumbers()
+{
+  ui.totalDicts->setText( QString::number( activeDicts.size() ) );
+
+  unsigned ready = 0, toIndex = 0;
+  for( unsigned x = 0; x < activeDicts.size(); x++ )
+  {
+    if( activeDicts.at( x )->haveFTSIndex() )
+      ready++;
+    else
+      toIndex++;
+  }
+
+  ui.readyDicts->setText( QString::number( ready ) );
+  ui.toIndexDicts->setText( QString::number( toIndex ) );
+}
+
+void FullTextSearchDialog::saveData()
+{
+  cfg.preferences.fts.searchMode = ui.searchMode->currentIndex();
+  cfg.preferences.fts.matchCase = ui.matchCase->isChecked();
+  cfg.preferences.fts.maxArticlesPerDictionary = ui.articlesPerDictionary->text().toInt();
+  cfg.preferences.fts.maxDistanceBetweenWords = ui.distanceBetweenWords->text().toInt();
+  cfg.preferences.fts.useMaxDistanceBetweenWords = ui.checkBoxDistanceBetweenWords->isChecked();
+  cfg.preferences.fts.useMaxArticlesPerDictionary = ui.checkBoxArticlesPerDictionary->isChecked();
+
+  cfg.preferences.fts.dialogGeometry = saveGeometry();
+}
+
+void FullTextSearchDialog::setNewIndexingName( QString name )
+{
+  ui.nowIndexingLabel->setText( tr( "Now indexing: " ) + name );
+  showDictNumbers();
+}
+
+void FullTextSearchDialog::setLimitsUsing()
+{
+  int mode = ui.searchMode->itemData( ui.searchMode->currentIndex() ).toInt();
+  if( mode == WholeWords || mode == PlainText )
+  {
+    ui.checkBoxDistanceBetweenWords->setEnabled( true );
+    ui.distanceBetweenWords->setEnabled( ui.checkBoxDistanceBetweenWords->isChecked() );
+  }
+  else
+  {
+    ui.checkBoxDistanceBetweenWords->setEnabled( false );
+    ui.distanceBetweenWords->setEnabled( false );
+  }
+  ui.articlesPerDictionary->setEnabled( ui.checkBoxArticlesPerDictionary->isChecked() );
+}
+
+void FullTextSearchDialog::accept()
+{
+  QStringList list1, list2;
+  int mode = ui.searchMode->itemData( ui.searchMode->currentIndex() ).toInt();
+
+  int maxResultsPerDict = ui.checkBoxArticlesPerDictionary->isChecked() ?
+                            ui.articlesPerDictionary->value() : -1;
+  int distanceBetweenWords = ui.checkBoxDistanceBetweenWords->isChecked() ?
+                               ui.distanceBetweenWords->value() : -1;
+
+  model->clear();
+  ui.articlesFoundLabel->setText( tr( "Articles found: " ) + QString::number( results.size() ) );
+
+  bool hasCJK;
+  if( !FtsHelpers::parseSearchString( ui.searchLine->text(), list1, list2,
+                                      searchRegExp, mode,
+                                      ui.matchCase->isChecked(),
+                                      distanceBetweenWords,
+                                      hasCJK ) )
+  {
+    if( hasCJK && ( mode == WholeWords || mode == PlainText ) )
+    {
+      QMessageBox message( QMessageBox::Warning,
+                           "GoldenDict",
+                           tr( "CJK symbols in search string are not compatible with search modes \"Whole words\" and \"Plain text\"" ),
+                           QMessageBox::Ok,
+                           this );
+      message.exec();
+    }
+    else
+    {
+      QMessageBox message( QMessageBox::Warning,
+                           "GoldenDict",
+                           tr( "The search line must contains at least one word containing " )
+                           + QString::number( MinimumWordSize ) + tr( " or more symbols" ),
+                           QMessageBox::Ok,
+                           this );
+      message.exec();
+    }
+    return;
+  }
+
+  if( activeDicts.empty() )
+  {
+    QMessageBox message( QMessageBox::Warning,
+                         "GoldenDict",
+                         tr( "No dictionaries for full-text search" ),
+                         QMessageBox::Ok,
+                         this );
+    message.exec();
+    return;
+  }
+
+  ui.OKButton->setEnabled( false );
+  ui.searchProgressBar->show();
+
+  // Make search requests
+
+  for( unsigned x = 0; x < activeDicts.size(); ++x )
+  {
+    sptr< Dictionary::DataRequest > req = activeDicts[ x ]->getSearchResults(
+                                                              ui.searchLine->text(),
+                                                              mode,
+                                                              ui.matchCase->isChecked(),
+                                                              distanceBetweenWords,
+                                                              maxResultsPerDict
+                                                            );
+    connect( req.get(), SIGNAL( finished() ),
+             this, SLOT( searchReqFinished() ), Qt::QueuedConnection );
+
+    searchReqs.push_back( req );
+  }
+
+  searchReqFinished(); // Handle any ones which have already finished
+}
+
+void FullTextSearchDialog::searchReqFinished()
+{
+  while ( searchReqs.size() )
+  {
+    std::list< sptr< Dictionary::DataRequest > >::iterator it;
+    for( it = searchReqs.begin(); it != searchReqs.end(); ++it )
+    {
+      if ( (*it)->isFinished() )
+      {
+        GD_DPRINTF( "one finished.\n" );
+
+        QString errorString = (*it)->getErrorString();
+
+        if ( (*it)->dataSize() >= 0 || errorString.size() )
+        {
+          QList< FtsHeadword > * headwords;
+          if( (unsigned)(*it)->dataSize() >= sizeof( headwords ) )
+          {
+            try
+            {
+              (*it)->getDataSlice( 0, sizeof( headwords ), &headwords );
+              model->addResults( QModelIndex(), *headwords );
+              delete headwords;
+              ui.articlesFoundLabel->setText( tr( "Articles found: " )
+                                              + QString::number( results.size() ) );
+            }
+            catch( std::exception & e )
+            {
+              gdWarning( "getDataSlice error: %s\n", e.what() );
+            }
+          }
+
+        }
+        break;
+      }
+    }
+    if( it != searchReqs.end() )
+    {
+      GD_DPRINTF( "erasing..\n" );
+      searchReqs.erase( it );
+      GD_DPRINTF( "erase done..\n" );
+      continue;
+    }
+    else
+      break;
+  }
+  if ( searchReqs.empty() )
+  {
+    ui.searchProgressBar->hide();
+    ui.OKButton->setEnabled( true );
+    QApplication::beep();
+  }
+}
+
+void FullTextSearchDialog::reject()
+{
+  if( !searchReqs.empty() )
+    stopSearch();
+  else
+  {
+    saveData();
+    emit closeDialog();
+  }
+}
+
+void FullTextSearchDialog::itemClicked( const QModelIndex & idx )
+{
+  if( idx.isValid() && idx.row() < results.size() )
+  {
+    QString headword = results[ idx.row() ].headword;
+    emit showTranslationFor( headword, results[ idx.row() ].dictIDs, searchRegExp );
+  }
+}
+
+void FullTextSearchDialog::updateDictionaries()
+{
+  activeDicts.clear();
+
+  // Find the given group
+
+  Instances::Group const * activeGroup = 0;
+
+  for( unsigned x = 0; x < groups.size(); ++x )
+    if ( groups[ x ].id == group )
+    {
+      activeGroup = &groups[ x ];
+      break;
+    }
+
+  // If we've found a group, use its dictionaries; otherwise, use the global
+  // heap.
+  std::vector< sptr< Dictionary::Class > > const & groupDicts =
+    activeGroup ? activeGroup->dictionaries : dictionaries;
+
+  // Exclude muted dictionaries
+
+  Config::Group const * grp = cfg.getGroup( group );
+  Config::MutedDictionaries const * mutedDicts;
+
+  if( group == Instances::Group::AllGroupId )
+    mutedDicts = &cfg.mutedDictionaries;
+  else
+    mutedDicts = grp ? &grp->mutedDictionaries : 0;
+
+  if( mutedDicts && !mutedDicts->isEmpty() )
+  {
+    activeDicts.reserve( groupDicts.size() );
+    for( unsigned x = 0; x < groupDicts.size(); ++x )
+      if ( groupDicts[ x ]->canFTS()
+           && !mutedDicts->contains( QString::fromStdString( groupDicts[ x ]->getId() ) )
+         )
+        activeDicts.push_back( groupDicts[ x ] );
+  }
+  else
+  {
+    for( unsigned x = 0; x < groupDicts.size(); ++x )
+      if ( groupDicts[ x ]->canFTS() )
+        activeDicts.push_back( groupDicts[ x ] );
+  }
+
+  showDictNumbers();
+}
+
+bool FullTextSearchDialog::eventFilter( QObject * obj, QEvent * ev )
+{
+  if( obj == ui.headwordsView && ev->type() == QEvent::KeyPress )
+  {
+    QKeyEvent * kev = static_cast< QKeyEvent * >( ev );
+    if( kev->key() == Qt::Key_Return || kev->key() == Qt::Key_Enter )
+    {
+      itemClicked( ui.headwordsView->currentIndex() );
+      return true;
+    }
+  }
+  return QDialog::eventFilter( obj, ev );
+}
+
+void FullTextSearchDialog::helpRequested()
+{
+  MainWindow * mainWindow = qobject_cast< MainWindow * >( parentWidget() );
+  if( mainWindow )
+    mainWindow->showGDHelpForID( "Full-text search" );
+}
+
+/// HeadwordsListModel
+
+int HeadwordsListModel::rowCount( QModelIndex const & ) const
+{
+  return headwords.size();
+}
+
+QVariant HeadwordsListModel::data( QModelIndex const & index, int role ) const
+{
+  if( index.row() < 0 )
+    return QVariant();
+
+  FtsHeadword const & head = headwords[ index.row() ];
+
+  if ( head.headword.isEmpty() )
+    return QVariant();
+
+  switch ( role )
+  {
+    case Qt::ToolTipRole:
+    {
+      QString tt;
+      for( int x = 0; x < head.dictIDs.size(); x++ )
+      {
+        if( x != 0 )
+          tt += "<br>";
+
+        int n = getDictIndex( head.dictIDs[ x ] );
+        if( n != -1 )
+          tt += QString::fromUtf8( dictionaries[ n ]->getName().c_str() ) ;
+      }
+      return tt;
+    }
+
+    case Qt::DisplayRole :
+      return head.headword;
+
+    case Qt::EditRole :
+      return head.headword;
+
+    default:;
+  }
+
+  return QVariant();
+}
+
+void HeadwordsListModel::addResults(const QModelIndex & parent, QList< FtsHeadword > const & hws )
+{
+Q_UNUSED( parent );
+  beginResetModel();
+
+  QList< FtsHeadword > temp;
+
+  for( int x = 0; x < hws.length(); x++ )
+  {
+    QList< FtsHeadword >::iterator it = qBinaryFind( headwords.begin(), headwords.end(), hws.at( x ) );
+    if( it != headwords.end() )
+      it->dictIDs.push_back( hws.at( x ).dictIDs.front() );
+    else
+      temp.append( hws.at( x ) );
+  }
+
+  headwords.append( temp );
+  qSort( headwords );
+
+  endResetModel();
+  emit contentChanged();
+}
+
+bool HeadwordsListModel::clear()
+{
+  beginResetModel();
+
+  headwords.clear();
+
+  endResetModel();
+
+  emit contentChanged();
+
+  return true;
+}
+
+int HeadwordsListModel::getDictIndex( QString const & id ) const
+{
+  std::string dictID( id.toUtf8().data() );
+  for( unsigned x = 0; x < dictionaries.size(); x++ )
+  {
+    if( dictionaries[ x ]->getId().compare( dictID ) == 0 )
+      return x;
+  }
+  return -1;
+}
+
+} // namespace FTS
diff -Nru goldendict-1.5.0~git20131003/fulltextsearch.hh goldendict-1.5.0~git20150923/fulltextsearch.hh
--- goldendict-1.5.0~git20131003/fulltextsearch.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/fulltextsearch.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,227 @@
+#ifndef __FULLTEXTSEARCH_HH_INCLUDED__
+#define __FULLTEXTSEARCH_HH_INCLUDED__
+
+#include <QSemaphore>
+#include <QStringList>
+#include <QRegExp>
+#include <QAbstractListModel>
+#include <QList>
+
+#include "dictionary.hh"
+#include "ui_fulltextsearch.h"
+#include "mutex.hh"
+#include "config.hh"
+#include "instances.hh"
+#include "delegate.hh"
+
+namespace FTS
+{
+
+enum {
+  // Minimum word length for indexing
+  MinimumWordSize = 4,
+
+  // Maximum dictionary size for first iteration of FTS indexing
+  MaxDictionarySizeForFastSearch = 150000,
+
+  // Maxumum match length for highlight search results
+  // (QWebPage::findText() crashes on too long strings)
+  MaxMatchLengthForHighlightResults = 500
+};
+
+enum SearchMode
+{
+  WholeWords = 0,
+  PlainText,
+  Wildcards,
+  RegExp
+};
+
+struct FtsHeadword
+{
+  QString headword;
+  QStringList dictIDs;
+
+  FtsHeadword( QString const & headword_, QString const & dictid_ ) :
+    headword( headword_ )
+  {
+    dictIDs.append( dictid_ );
+  }
+
+  bool operator <( FtsHeadword const & other ) const
+  {
+    if( headword[ 0 ] == '\"' || headword[ 0 ] == '\'' )
+      return headword.mid( 1 ).localeAwareCompare( other.headword ) < 0;
+    else
+      return headword.localeAwareCompare( other.headword ) < 0;
+  }
+
+  bool operator ==( FtsHeadword const & other ) const
+  { return headword.compare( other.headword, Qt::CaseInsensitive ) == 0; }
+
+  bool operator !=( FtsHeadword const & other ) const
+  { return headword.compare( other.headword, Qt::CaseInsensitive ) != 0; }
+};
+
+class Indexing : public QObject, public QRunnable
+{
+Q_OBJECT
+
+  QAtomicInt & isCancelled;
+  std::vector< sptr< Dictionary::Class > > const & dictionaries;
+  QSemaphore & hasExited;
+
+public:
+  Indexing( QAtomicInt & cancelled, std::vector< sptr< Dictionary::Class > > const & dicts,
+            QSemaphore & hasExited_):
+    isCancelled( cancelled ),
+    dictionaries( dicts ),
+    hasExited( hasExited_ )
+  {}
+
+  ~Indexing()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+
+signals:
+  void sendNowIndexingName( QString );
+};
+
+class FtsIndexing : public QObject
+{
+Q_OBJECT
+public:
+  FtsIndexing( std::vector< sptr< Dictionary::Class > > const & dicts );
+  virtual ~FtsIndexing()
+  { stopIndexing(); }
+
+  void setDictionaries( std::vector< sptr< Dictionary::Class > > const & dicts )
+  {
+    clearDictionaries();
+    dictionaries = dicts;
+  }
+
+  void clearDictionaries()
+  { dictionaries.clear(); }
+
+  /// Start dictionaries indexing for full-text search
+  void doIndexing();
+
+  /// Break indexing thread
+  void stopIndexing();
+
+  QString nowIndexingName();
+
+protected:
+  QAtomicInt isCancelled;
+  QSemaphore indexingExited;
+  std::vector< sptr< Dictionary::Class > > dictionaries;
+  bool started;
+  QString nowIndexing;
+  Mutex nameMutex;
+
+private slots:
+  void setNowIndexedName( QString name );
+
+signals:
+  void newIndexingName( QString name );
+};
+
+/// A model to be projected into the view, according to Qt's MVC model
+class HeadwordsListModel: public QAbstractListModel
+{
+  Q_OBJECT
+
+public:
+
+  HeadwordsListModel( QWidget * parent, QList< FtsHeadword > & headwords_,
+                      std::vector< sptr< Dictionary::Class > > const & dicts ):
+    QAbstractListModel( parent ), headwords( headwords_ ),
+    dictionaries( dicts )
+  {}
+
+  int rowCount( QModelIndex const & parent ) const;
+  QVariant data( QModelIndex const & index, int role ) const;
+
+//  bool insertRows( int row, int count, const QModelIndex & parent );
+//  bool removeRows( int row, int count, const QModelIndex & parent );
+//  bool setData( QModelIndex const & index, const QVariant & value, int role );
+
+  void addResults(const QModelIndex & parent, QList< FtsHeadword > const & headwords );
+  bool clear();
+
+private:
+
+  QList< FtsHeadword > & headwords;
+  std::vector< sptr< Dictionary::Class > > const & dictionaries;
+
+  int getDictIndex( QString const & id ) const;
+
+signals:
+  void contentChanged();
+};
+
+class FullTextSearchDialog : public QDialog
+{
+  Q_OBJECT
+
+  Config::Class & cfg;
+  std::vector< sptr< Dictionary::Class > > const & dictionaries;
+  std::vector< Instances::Group > const & groups;
+  unsigned group;
+  std::vector< sptr< Dictionary::Class > > activeDicts;
+
+  std::list< sptr< Dictionary::DataRequest > > searchReqs;
+
+  FtsIndexing & ftsIdx;
+
+  QRegExp searchRegExp;
+public:
+  FullTextSearchDialog( QWidget * parent,
+                        Config::Class & cfg_,
+                        std::vector< sptr< Dictionary::Class > > const & dictionaries_,
+                        std::vector< Instances::Group > const & groups_,
+                        FtsIndexing & ftsidx );
+  virtual ~FullTextSearchDialog();
+
+  void setCurrentGroup( unsigned group_ )
+  { group = group_; updateDictionaries(); }
+
+  void stopSearch();
+
+protected:
+  bool eventFilter( QObject * obj, QEvent * ev );
+
+private:
+  Ui::FullTextSearchDialog ui;
+  QList< FtsHeadword > results;
+  HeadwordsListModel * model;
+  WordListItemDelegate * delegate;
+  QAction helpAction;
+
+  void showDictNumbers();
+
+private slots:
+  void setNewIndexingName( QString );
+  void saveData();
+  void accept();
+  void setLimitsUsing();
+  void searchReqFinished();
+  void reject();
+  void itemClicked( QModelIndex const & idx );
+  void updateDictionaries();
+  void helpRequested();
+
+signals:
+  void showTranslationFor( QString const &, QStringList const & dictIDs,
+                           QRegExp const & searchRegExp );
+  void closeDialog();
+};
+
+
+} // namespace FTS
+
+#endif // __FULLTEXTSEARCH_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/fulltextsearch.ui goldendict-1.5.0~git20150923/fulltextsearch.ui
--- goldendict-1.5.0~git20131003/fulltextsearch.ui	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/fulltextsearch.ui	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FullTextSearchDialog</class>
+ <widget class="QDialog" name="FullTextSearchDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>492</width>
+    <height>593</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>430</width>
+    <height>450</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Search</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLineEdit" name="searchLine"/>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="2">
+         <widget class="QCheckBox" name="matchCase">
+          <property name="text">
+           <string>Match case</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>Mode:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="searchMode"/>
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="1">
+         <widget class="QSpinBox" name="articlesPerDictionary"/>
+        </item>
+        <item row="0" column="1">
+         <widget class="QSpinBox" name="distanceBetweenWords"/>
+        </item>
+        <item row="0" column="0">
+         <widget class="QCheckBox" name="checkBoxDistanceBetweenWords">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QCheckBox" name="checkBoxArticlesPerDictionary">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListView" name="headwordsView"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="articlesFoundLabel">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>21</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Articles found:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QProgressBar" name="searchProgressBar">
+       <property name="maximum">
+        <number>0</number>
+       </property>
+       <property name="value">
+        <number>-1</number>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Available dictionaries in group:</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="1" column="0" colspan="2">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Wait for indexing:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="totalDicts">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QLabel" name="readyDicts">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Total:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Indexed:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="toIndexDicts">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="nowIndexingLabel">
+     <property name="text">
+      <string>Now indexing: None</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="OKButton">
+       <property name="text">
+        <string>Search</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="helpButton">
+       <property name="text">
+        <string>Help</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>searchLine</tabstop>
+  <tabstop>headwordsView</tabstop>
+  <tabstop>checkBoxDistanceBetweenWords</tabstop>
+  <tabstop>distanceBetweenWords</tabstop>
+  <tabstop>searchMode</tabstop>
+  <tabstop>checkBoxArticlesPerDictionary</tabstop>
+  <tabstop>articlesPerDictionary</tabstop>
+  <tabstop>matchCase</tabstop>
+  <tabstop>OKButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff -Nru goldendict-1.5.0~git20131003/gdappstyle.cc goldendict-1.5.0~git20150923/gdappstyle.cc
--- goldendict-1.5.0~git20131003/gdappstyle.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/gdappstyle.cc	2015-09-23 08:26:24.000000000 +0000
@@ -33,6 +33,12 @@
     }
   }
 
+  // Qt don't upscale icons for high dpi scales
+  // We limit maximum small icon size to 21 pixel
+  // (standard icon size for Lingvo dictionaries)
+  if( metric == QStyle::PM_SmallIconSize )
+    return defaultVal < 21 ? defaultVal : 21;
+
   return defaultVal;
 }
 
diff -Nru goldendict-1.5.0~git20131003/gddebug.cc goldendict-1.5.0~git20150923/gddebug.cc
--- goldendict-1.5.0~git20131003/gddebug.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/gddebug.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,55 @@
+/* This file is (c) 2013 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include <QTextCodec>
+#include <QString>
+#include "gddebug.hh"
+
+QFile logFile;
+static QTextCodec * utf8Codec;
+
+void gdWarning(const char *msg, ...)
+{
+va_list ap;
+va_start(ap, msg);
+QTextCodec *localeCodec = 0;
+
+  if( logFile.isOpen() )
+  {
+    if( utf8Codec == 0 )
+      utf8Codec = QTextCodec::codecForName( "UTF8" );
+
+    localeCodec = QTextCodec::codecForLocale();
+    QTextCodec::setCodecForLocale( utf8Codec );
+  }
+
+  qWarning( "%s", QString().vsprintf( msg, ap ).toUtf8().data() );
+
+  if( logFile.isOpen() )
+  {
+    QTextCodec::setCodecForLocale( localeCodec );
+  }
+}
+
+void gdDebug(const char *msg, ...)
+{
+va_list ap;
+va_start(ap, msg);
+QTextCodec *localeCodec = 0;
+
+  if( logFile.isOpen() )
+  {
+    if( utf8Codec == 0 )
+      utf8Codec = QTextCodec::codecForName( "UTF8" );
+
+    localeCodec = QTextCodec::codecForLocale();
+    QTextCodec::setCodecForLocale( utf8Codec );
+  }
+
+  qDebug( "%s", QString().vsprintf( msg, ap ).toUtf8().data() );
+
+  if( logFile.isOpen() )
+  {
+    QTextCodec::setCodecForLocale( localeCodec );
+  }
+}
diff -Nru goldendict-1.5.0~git20131003/gddebug.hh goldendict-1.5.0~git20150923/gddebug.hh
--- goldendict-1.5.0~git20131003/gddebug.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/gddebug.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef __GDDEBUG_HH_INCLUDED__
+#define __GDDEBUG_HH_INCLUDED__
+
+#include <QFile>
+
+#ifdef NO_CONSOLE
+#define GD_DPRINTF(...)
+#define GD_FDPRINTF(...)
+#else
+#define GD_DPRINTF(...) printf(__VA_ARGS__)
+#define GD_FDPRINTF(...) fprintf(__VA_ARGS__)
+#endif
+
+void gdWarning(const char *, ...) /* print warning message */
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
+    __attribute__ ((format (printf, 1, 2)))
+#endif
+;
+
+void gdDebug(const char *, ...)
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
+    __attribute__ ((format (printf, 1, 2)))
+#endif
+;
+
+extern QFile logFile;
+
+#endif // __GDDEBUG_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/gestures.cc goldendict-1.5.0~git20150923/gestures.cc
--- goldendict-1.5.0~git20131003/gestures.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/gestures.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,395 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include <QTouchEvent>
+#include <QSwipeGesture>
+#include <QVariant>
+#include <math.h>
+#include "articleview.hh"
+#include "gestures.hh"
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+
+namespace Gestures
+{
+
+Qt::GestureType GDPinchGestureType;
+Qt::GestureType GDSwipeGestureType;
+static bool fewTouchPointsPresented;
+
+bool isFewTouchPointsPresented()
+{
+  return fewTouchPointsPresented;
+}
+
+QSwipeGesture::SwipeDirection getHorizontalDirection( qreal angle )
+{
+  if ( ( 0 <= angle && angle <= 45 )
+       || ( 315 <= angle && angle <= 360 ) )
+    return QSwipeGesture::Right;
+
+  if ( 135 <= angle && angle <= 225 )
+    return QSwipeGesture::Left;
+
+  return QSwipeGesture::NoDirection;
+}
+
+QSwipeGesture::SwipeDirection getVerticalDirection( qreal angle )
+{
+  if ( 45 < angle && angle < 135 )
+    return QSwipeGesture::Up;
+
+  if ( 225 < angle && angle < 315 )
+    return QSwipeGesture::Down;
+
+  return QSwipeGesture::NoDirection;
+}
+
+GDPinchGesture::GDPinchGesture() :
+isNewSequence( true )
+{
+}
+
+QGesture * GDPinchGestureRecognizer::create( QObject * pTarget )
+{
+  if ( pTarget && pTarget->isWidgetType()) {
+    static_cast< QWidget * >( pTarget )->setAttribute( Qt::WA_AcceptTouchEvents );
+  }
+  QGesture *pGesture = new GDPinchGesture;
+  return pGesture;
+}
+
+void GDPinchGestureRecognizer::reset( QGesture * pGesture )
+{
+  QGestureRecognizer::reset( pGesture );
+}
+
+QGestureRecognizer::Result GDPinchGestureRecognizer::recognize( QGesture * state,
+                                                                QObject *,
+                                                                QEvent * event)
+{
+  const QTouchEvent *ev = static_cast< const QTouchEvent * >( event );
+  QGestureRecognizer::Result result = QGestureRecognizer::Ignore;
+  GDPinchGesture * gest = static_cast< GDPinchGesture * >( state );
+
+  switch ( event->type() )
+  {
+    case QEvent::TouchBegin:
+      {
+        result = QGestureRecognizer::MayBeGesture;
+        gest->isNewSequence = true;
+        break;
+      }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    case QEvent::TouchCancel:
+#endif
+    case QEvent::TouchEnd:
+      {
+        result = QGestureRecognizer::CancelGesture;
+        fewTouchPointsPresented = false;
+        break;
+      }
+    case QEvent::TouchUpdate:
+      {
+        gest->scaleChanged = false;
+        fewTouchPointsPresented = ( ev->touchPoints().size() > 1 );
+        if ( ev->touchPoints().size() == 2 )
+        {
+          QTouchEvent::TouchPoint p1 = ev->touchPoints().at( 0 );
+          QTouchEvent::TouchPoint p2 = ev->touchPoints().at( 1 );
+
+          QPointF centerPoint = ( p1.screenPos() + p2.screenPos() ) / 2.0;
+          gest->setHotSpot( centerPoint );
+          if ( gest->isNewSequence )
+          {
+            gest->startPosition[ 0 ] = p1.screenPos();
+            gest->startPosition[ 1 ] = p2.screenPos();
+            gest->lastCenterPoint = centerPoint;
+          }
+          else
+          {
+            gest->lastCenterPoint = gest->centerPoint;
+          }
+          gest->centerPoint = centerPoint;
+
+          if ( gest->isNewSequence )
+          {
+            gest->scaleFactor = 1.0;
+            gest->lastScaleFactor = 1.0;
+            gest->totalScaleFactor = 1.0;
+          }
+          else
+          {
+            gest->lastScaleFactor = gest->scaleFactor;
+            QLineF line( p1.screenPos(), p2.screenPos() );
+            QLineF lastLine( p1.lastScreenPos(),  p2.lastScreenPos() );
+            gest->scaleFactor = line.length() / lastLine.length();
+          }
+
+          gest->totalScaleFactor = gest->totalScaleFactor * gest->scaleFactor;
+          gest->scaleChanged = true;
+
+          gest->isNewSequence = false;
+          if( gest->totalScaleFactor <= OUT_SCALE_LIMIT || gest->totalScaleFactor >= IN_SCALE_LIMIT )
+          {
+            result = QGestureRecognizer::TriggerGesture;
+            gest->isNewSequence = true;
+          }
+          else
+            result = QGestureRecognizer::MayBeGesture;
+        }
+        else
+        {
+          gest->isNewSequence = true;
+          if ( gest->state() == Qt::NoGesture )
+            result = QGestureRecognizer::Ignore;
+          else
+            result = QGestureRecognizer::FinishGesture;
+        }
+        break;
+    }
+  case QEvent::MouseButtonPress:
+  case QEvent::MouseMove:
+  case QEvent::MouseButtonRelease:
+      result = QGestureRecognizer::Ignore;
+      break;
+  default:
+      result = QGestureRecognizer::Ignore;
+      break;
+  }
+  return result;
+}
+
+
+GDSwipeGesture::GDSwipeGesture() :
+vertDirection( QSwipeGesture::NoDirection ),
+horizDirection( QSwipeGesture::NoDirection ),
+started( false )
+{
+}
+
+QGesture * GDSwipeGestureRecognizer::create( QObject * pTarget )
+{
+  if ( pTarget && pTarget->isWidgetType() ) {
+    static_cast< QWidget * >( pTarget )->setAttribute( Qt::WA_AcceptTouchEvents );
+  }
+  QGesture *pGesture = new GDSwipeGesture;
+  return pGesture;
+}
+
+void GDSwipeGestureRecognizer::reset( QGesture * pGesture )
+{
+  GDSwipeGesture * gest = static_cast< GDSwipeGesture * >( pGesture );
+  gest->vertDirection = QSwipeGesture::NoDirection;
+  gest->horizDirection = QSwipeGesture::NoDirection;
+  gest->lastPositions[ 0 ] = QPoint();
+  gest->lastPositions[ 1 ] = QPoint();
+
+  QGestureRecognizer::reset( pGesture );
+}
+
+qreal GDSwipeGestureRecognizer::computeAngle( int dx, int dy )
+{
+   double PI = 3.14159265;
+
+   // Need to convert from screen coordinates direction
+   // into classical coordinates direction.
+   dy = -dy;
+
+   double result = atan2( (double)dy, (double)dx ) ;
+   result = ( result * 180 ) / PI;
+
+   // Always return positive angle.
+   if ( result < 0 )
+      result += 360;
+
+   return result;
+}
+
+QGestureRecognizer::Result GDSwipeGestureRecognizer::recognize( QGesture * state,
+                                                                QObject *,
+                                                                QEvent * event)
+{
+  GDSwipeGesture * swipe = static_cast< GDSwipeGesture * >( state );
+  const QTouchEvent * ev = static_cast< const QTouchEvent * >( event );
+  QGestureRecognizer::Result result = QGestureRecognizer::Ignore;
+
+  switch( event->type() )
+  {
+    case QEvent::TouchBegin:
+      {
+        swipe->unsetHotSpot();
+        swipe->lastPositions[ 0 ] = QPoint();
+        swipe->started = true;
+        result = QGestureRecognizer::MayBeGesture;
+        break;
+      }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    case QEvent::TouchCancel:
+#endif
+    case QEvent::TouchEnd:
+      {
+        fewTouchPointsPresented = false;
+        result = QGestureRecognizer::CancelGesture;
+        break;
+      }
+    case QEvent::TouchUpdate:
+      {
+        fewTouchPointsPresented = ( ev->touchPoints().size() > 1 );
+        if( !swipe->started )
+          result = QGestureRecognizer::CancelGesture;
+        else
+        if( ev->touchPoints().size() == 2 )
+        {
+          //2-point gesture
+
+          QTouchEvent::TouchPoint p1 = ev->touchPoints().at( 0 );
+          QTouchEvent::TouchPoint p2 = ev->touchPoints().at( 1 );
+
+          if (swipe->lastPositions[0].isNull()) {
+            swipe->lastPositions[ 0 ] = p1.startScreenPos().toPoint();
+            swipe->lastPositions[ 1 ] = p2.startScreenPos().toPoint();
+          }
+
+          if( !swipe->hasHotSpot() )
+          {
+            swipe->setHotSpot( ( p1.startScreenPos() + p2.startScreenPos() ) / 2 );
+          }
+
+          int dx1 = p1.screenPos().toPoint().x() - swipe->lastPositions[ 0 ].x();
+          int dx2 = p2.screenPos().toPoint().x() - swipe->lastPositions[ 1 ].x();
+          int dy1 = p1.screenPos().toPoint().y() - swipe->lastPositions[ 0 ].y();
+          int dy2 = p2.screenPos().toPoint().y() - swipe->lastPositions[ 1 ].y();
+
+          if( qAbs( ( dx1 + dx2 ) / 2.0 ) >= MOVE_X_TRESHOLD ||
+              qAbs( ( dy1 + dy2 ) / 2.0 ) >= MOVE_Y_TRESHOLD )
+          {
+            qreal angle1 = computeAngle( dx1, dy1 );
+            qreal angle2 = computeAngle( dx2, dy2 );
+            QSwipeGesture::SwipeDirection vertDir = getVerticalDirection( angle1 );
+            QSwipeGesture::SwipeDirection horizDir = getHorizontalDirection( angle1 );
+
+            if( vertDir != getVerticalDirection( angle2 ) ||
+                horizDir != getHorizontalDirection( angle2 ) )
+            {
+              // It seems it is no swipe gesture
+              result = QGestureRecognizer::CancelGesture;
+              break;
+            }
+
+            if( ( swipe->vertDirection != QSwipeGesture::NoDirection && horizDir != QSwipeGesture::NoDirection ) ||
+                ( swipe->horizDirection != QSwipeGesture::NoDirection && vertDir != QSwipeGesture::NoDirection ) )
+            {
+              // Gesture direction changed
+              result = QGestureRecognizer::CancelGesture;
+              break;
+            }
+
+            swipe->vertDirection = vertDir;
+            swipe->horizDirection = horizDir;
+
+            swipe->lastPositions[ 0 ] = p1.screenPos().toPoint();
+            swipe->lastPositions[ 1 ] = p2.screenPos().toPoint();
+
+            result = QGestureRecognizer::TriggerGesture;
+          }
+          else
+            result = QGestureRecognizer::MayBeGesture;
+        }
+        else // No 2-point gesture
+          result = QGestureRecognizer::CancelGesture;
+        break;
+      }
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseMove:
+    case QEvent::MouseButtonRelease:
+          result = QGestureRecognizer::Ignore;
+          break;
+    default:
+        result = QGestureRecognizer::Ignore;
+        break;
+  }
+
+  return result;
+}
+
+const qreal GDPinchGestureRecognizer::OUT_SCALE_LIMIT = 0.5;
+const qreal GDPinchGestureRecognizer::IN_SCALE_LIMIT = 2;
+
+bool handleGestureEvent( QObject * obj, QEvent * event, GestureResult & result,
+                         QPoint & point )
+{
+  result = NOT_HANLDED;
+
+  if( event->type() != QEvent::Gesture || !obj->isWidgetType() )
+    return false;
+
+  QGestureEvent * gev = static_cast<QGestureEvent *>( event );
+
+  gev->accept( Qt::PanGesture );
+
+  QGesture * gesture = gev->gesture( GDSwipeGestureType );
+  if( gesture )
+  {
+    GDSwipeGesture * swipe = static_cast< GDSwipeGesture * >( gesture );
+    point = swipe->hotSpot().toPoint();
+
+    if( swipe->getHorizDirection() != QSwipeGesture::NoDirection )
+      result = swipe->getHorizDirection() == QSwipeGesture::Left ?
+               SWIPE_LEFT : SWIPE_RIGHT;
+
+    if( swipe->getVertDirection() != QSwipeGesture::NoDirection )
+      result = swipe->getVertDirection() == QSwipeGesture::Up ?
+                SWIPE_UP : SWIPE_DOWN;
+
+    gev->setAccepted( true );
+    return true;
+  }
+
+  gesture = gev->gesture( GDPinchGestureType );
+  if( gesture )
+  {
+    GDPinchGesture * pinch = static_cast< GDPinchGesture * >( gesture );
+    point = pinch->getCenterPoint().toPoint();
+
+    if( pinch->isScaleChanged() )
+    {
+      if( pinch->getTotalScaleFactor() <= GDPinchGestureRecognizer::OUT_SCALE_LIMIT )
+        result = ZOOM_OUT;
+      if( pinch->getTotalScaleFactor() >= GDPinchGestureRecognizer::IN_SCALE_LIMIT )
+        result = ZOOM_IN;
+    }
+    gev->setAccepted( true );
+    return true;
+  }
+
+  gesture = gev->gesture( Qt::PanGesture );
+  if( gesture )
+  {
+    gev->setAccepted( true );
+    return true;
+  }
+  return false;
+}
+
+void registerRecognizers()
+{
+  QGestureRecognizer * pRecognizer = new Gestures::GDPinchGestureRecognizer();
+  GDPinchGestureType = QGestureRecognizer::registerRecognizer( pRecognizer );
+
+  pRecognizer = new Gestures::GDSwipeGestureRecognizer();
+  GDSwipeGestureType = QGestureRecognizer::registerRecognizer( pRecognizer );
+}
+
+void unregisterRecognizers()
+{
+  if( GDPinchGestureType )
+    QGestureRecognizer::unregisterRecognizer( GDPinchGestureType );
+
+  if( GDSwipeGestureType )
+    QGestureRecognizer::unregisterRecognizer( GDSwipeGestureType );
+}
+
+} // namespace
+
+#endif //QT_VERSION
diff -Nru goldendict-1.5.0~git20131003/gestures.hh goldendict-1.5.0~git20150923/gestures.hh
--- goldendict-1.5.0~git20131003/gestures.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/gestures.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,117 @@
+#ifndef __GESTURES_HH_INCLUDED__
+#define __GESTURES_HH_INCLUDED__
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+
+#include <QGestureRecognizer>
+#include <QGesture>
+#include <QTimer>
+#include <QEvent>
+#include <QAction>
+
+namespace Gestures
+{
+
+enum GestureResult
+{
+  NOT_HANLDED,
+  SWIPE_LEFT,
+  SWIPE_RIGHT,
+  SWIPE_UP,
+  SWIPE_DOWN,
+  ZOOM_IN,
+  ZOOM_OUT
+};
+
+extern Qt::GestureType GDPinchGestureType;
+extern Qt::GestureType GDSwipeGestureType;
+
+void registerRecognizers();
+
+void unregisterRecognizers();
+
+bool isFewTouchPointsPresented();
+
+class GDPinchGestureRecognizer;
+class GDPinchGesture : public QGesture
+{
+public:
+  GDPinchGesture();
+
+  bool isScaleChanged() const
+  { return scaleChanged; }
+  QPointF const & getCenterPoint() const
+  { return centerPoint; }
+  qreal getTotalScaleFactor() const
+  { return totalScaleFactor; }
+
+protected:
+  QPointF startCenterPoint;
+  QPointF lastCenterPoint;
+  QPointF centerPoint;
+
+  qreal lastScaleFactor;
+  qreal scaleFactor;
+  qreal totalScaleFactor;
+
+  bool isNewSequence;
+  QPointF startPosition[ 2 ];
+  bool scaleChanged;
+
+  friend class GDPinchGestureRecognizer;
+};
+
+class GDSwipeGestureRecognizer;
+class GDSwipeGesture : public QGesture
+{
+public:
+  GDSwipeGesture();
+  QSwipeGesture::SwipeDirection getHorizDirection() const
+  { return horizDirection; }
+  QSwipeGesture::SwipeDirection getVertDirection() const
+  { return vertDirection; }
+
+protected:
+  QSwipeGesture::SwipeDirection vertDirection;
+  QSwipeGesture::SwipeDirection horizDirection;
+  QPoint lastPositions[ 2 ];
+  bool started;
+
+  friend class GDSwipeGestureRecognizer;
+};
+
+class GDPinchGestureRecognizer : public QGestureRecognizer
+{
+public:
+  static const qreal OUT_SCALE_LIMIT;
+  static const qreal IN_SCALE_LIMIT;
+
+  GDPinchGestureRecognizer() {}
+private:
+
+  virtual QGesture* create( QObject* pTarget );
+  virtual QGestureRecognizer::Result recognize( QGesture* pGesture, QObject *pWatched, QEvent * pEvent );
+  void reset( QGesture *pGesture );
+};
+
+class GDSwipeGestureRecognizer : public QGestureRecognizer
+{
+public:
+  GDSwipeGestureRecognizer(){}
+private:
+  static const int MOVE_X_TRESHOLD = 100;
+  static const int MOVE_Y_TRESHOLD = 50;
+
+  virtual QGesture * create( QObject* pTarget );
+  virtual QGestureRecognizer::Result recognize( QGesture* pGesture, QObject * pWatched, QEvent * pEvent );
+  void reset ( QGesture * pGesture );
+  qreal computeAngle( int dx, int dy );
+};
+
+bool handleGestureEvent( QObject * obj, QEvent * event, GestureResult & result, QPoint & point );
+
+} // namespace
+
+#endif
+
+#endif // __GESTURES_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/goldendict.pro goldendict-1.5.0~git20150923/goldendict.pro
--- goldendict-1.5.0~git20131003/goldendict.pro	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/goldendict.pro	2015-09-23 08:26:24.000000000 +0000
@@ -20,9 +20,11 @@
 QT += xml
 QT += network
 QT += svg
+QT += sql
 CONFIG += exceptions \
     rtti \
-    stl
+    stl \
+    help
 OBJECTS_DIR = build
 UI_DIR = build
 MOC_DIR = build
@@ -139,6 +141,9 @@
     desktops.path = $$PREFIX/share/applications
     desktops.files = redist/*.desktop
     INSTALLS += desktops
+    helps.path = $$PREFIX/share/goldendict/help/
+    helps.files = help/*.qch
+    INSTALLS += helps
 }
 mac {
     TARGET = GoldenDict
@@ -171,7 +176,9 @@
     QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
                       cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
                       mkdir -p GoldenDict.app/Contents/MacOS/locale & \
-                      cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/
+                      cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
+                      mkdir -p GoldenDict.app/Contents/MacOS/help & \
+                      cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
 
     CONFIG += zim_support
 }
@@ -257,7 +264,6 @@
     parsecmdline.hh \
     dictspanewidget.hh \
     maintabwidget.hh \
-    dprintf.hh \
     mainstatusbar.hh \
     gdappstyle.hh \
     ufile.hh \
@@ -279,7 +285,16 @@
     ffmpegaudio.hh \
     articleinspector.hh \
     delegate.hh \
-    zim.hh
+    zim.hh \
+    gddebug.hh \
+    gestures.hh \
+    tiff.hh \
+    dictheadwords.hh \
+    fulltextsearch.hh \
+    ftshelpers.hh \
+    dictserver.hh \
+    helpwindow.hh \
+    slob.hh
 
 FORMS += groups.ui \
     dictgroupwidget.ui \
@@ -293,7 +308,11 @@
     about.ui \
     editdictionaries.ui \
     orderandprops.ui \
-    dictinfo.ui
+    dictinfo.ui \
+    dictheadwords.ui \
+    authentication.ui \
+    fulltextsearch.ui
+
 SOURCES += folding.cc \
     main.cc \
     dictionary.cc \
@@ -389,7 +408,16 @@
     ffmpegaudio.cc \
     articleinspector.cc \
     delegate.cc \
-    zim.cc
+    zim.cc \
+    gddebug.cc \
+    gestures.cc \
+    tiff.cc \
+    dictheadwords.cc \
+    fulltextsearch.cc \
+    ftshelpers.cc \
+    dictserver.cc \
+    helpwindow.cc \
+    slob.cc
 
 win32 {
 	FORMS   += texttospeechsource.ui
@@ -424,6 +452,25 @@
   LIBS += -llzma
 }
 
+!CONFIG( no_extra_tiff_handler ) {
+  DEFINES += MAKE_EXTRA_TIFF_HANDLER
+  LIBS += -ltiff
+}
+
+CONFIG( no_epwing_support ) {
+  DEFINES += NO_EPWING_SUPPORT
+}
+
+!CONFIG( no_epwing_support ) {
+  HEADERS += epwing.hh \
+             epwing_book.hh \
+             epwing_charmap.hh
+  SOURCES += epwing.cc \
+             epwing_book.cc \
+             epwing_charmap.cc
+  LIBS += -leb
+}
+
 RESOURCES += resources.qrc \
     flags.qrc
 TRANSLATIONS += locale/ru_RU.ts \
@@ -457,7 +504,9 @@
     locale/nl_NL.ts \
     locale/sr_SR.ts \
     locale/sv_SE.ts \
-    locale/tk_TM.ts
+    locale/tk_TM.ts \
+    locale/fa_IR.ts \
+    locale/mk_MK.ts
 
 # Build version file
 !isEmpty( hasGit ) {
diff -Nru goldendict-1.5.0~git20131003/groups.cc goldendict-1.5.0~git20150923/groups.cc
--- goldendict-1.5.0~git20131003/groups.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/groups.cc	2015-09-23 08:26:24.000000000 +0000
@@ -26,6 +26,21 @@
   ui.searchLine->applyTo( ui.dictionaries );
   addAction( ui.searchLine->getFocusAction() );
 
+  groupsListMenu = new QMenu( tr( "Group tabs" ), ui.groups );
+
+  groupsListButton = new QToolButton( ui.groups );
+  groupsListButton->setAutoRaise( true );
+  groupsListButton->setIcon( QIcon( ":/icons/windows-list.png" ) );
+  groupsListButton->setMenu( groupsListMenu );
+  groupsListButton->setToolTip( tr( "Open groups list" ) );
+  groupsListButton->setPopupMode( QToolButton::InstantPopup );
+  ui.groups->setCornerWidget( groupsListButton );
+  groupsListButton->setFocusPolicy( Qt::ClickFocus );
+
+  connect(groupsListMenu, SIGNAL( aboutToShow() ), this, SLOT( fillGroupsMenu() ) );
+  connect(groupsListMenu, SIGNAL( triggered( QAction * ) ),
+          this, SLOT( switchToGroup( QAction * ) ) );
+
   // Populate groups' widget
 
   ui.groups->populate( groups, dicts, ui.dictionaries->getCurrentDictionaries() );
@@ -205,4 +220,27 @@
   }
 }
 
+void Groups::fillGroupsMenu()
+{
+  groupsListMenu->clear();
+  for( int i = 0; i < ui.groups->count(); i++ )
+  {
+    QAction * act = groupsListMenu->addAction( ui.groups->tabText( i ) );
+    act->setData( i );
+    if (ui.groups->currentIndex() == i)
+    {
+      QFont f( act->font() );
+      f.setBold( true );
+      act->setFont( f );
+    }
+  }
+
+  if( groupsListMenu->actions().size() > 1 )
+    groupsListMenu->setActiveAction( groupsListMenu->actions().at( ui.groups->currentIndex() ) );
+}
 
+void Groups::switchToGroup( QAction * act )
+{
+  int idx = act->data().toInt();
+  ui.groups->setCurrentIndex(idx);
+}
diff -Nru goldendict-1.5.0~git20131003/groups.hh goldendict-1.5.0~git20150923/groups.hh
--- goldendict-1.5.0~git20131003/groups.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/groups.hh	2015-09-23 08:26:24.000000000 +0000
@@ -9,6 +9,7 @@
 #include "dictionary.hh"
 #include "groups_widgets.hh"
 #include <QToolButton>
+#include <QMenu>
 
 class Groups: public QWidget
 {
@@ -35,6 +36,9 @@
   std::vector< sptr< Dictionary::Class > > const & dicts;
   Config::Groups groups;
 
+  QToolButton * groupsListButton;
+  QMenu * groupsListMenu;
+
   // Reacts to the event that the number of groups is possibly changed
   void countChanged();
 
@@ -47,6 +51,8 @@
   void removeFromGroup();
   void addAutoGroups();
   void showDictInfo( const QPoint & pos );
+  void fillGroupsMenu();
+  void switchToGroup( QAction * act );
 
 signals:
   void showDictionaryInfo( QString const & id );
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/help/gdhelp_en.qch and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/help/gdhelp_en.qch differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/help/gdhelp_ru.qch and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/help/gdhelp_ru.qch differ
diff -Nru goldendict-1.5.0~git20131003/helpwindow.cc goldendict-1.5.0~git20150923/helpwindow.cc
--- goldendict-1.5.0~git20131003/helpwindow.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/helpwindow.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,264 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#include <QDir>
+#include <QFileInfo>
+#include <QSplitter>
+#include <QHelpContentWidget>
+#include <QHelpIndexWidget>
+#include <QLayout>
+#include <QDesktopServices>
+
+#include "helpwindow.hh"
+#include "gddebug.hh"
+
+namespace Help {
+
+HelpBrowser::HelpBrowser( QHelpEngineCore * engine, QWidget *parent ) :
+    QTextBrowser( parent ),
+    helpEngine( engine )
+{
+  connect( this, SIGNAL( anchorClicked( QUrl ) ), this, SLOT( linkClicked( QUrl ) ) );
+}
+
+void HelpBrowser::showHelpForKeyword( QString const & id )
+{
+  if ( helpEngine )
+  {
+    QMap< QString, QUrl > links = helpEngine->linksForIdentifier( id );
+    if( !links.isEmpty() )
+      setSource( links.constBegin().value() );
+  }
+}
+
+QVariant HelpBrowser::loadResource( int type, QUrl const & name )
+{
+  QByteArray ba;
+  if( type < 4 && helpEngine )
+  {
+    QUrl url(name);
+    if( name.isRelative() )
+      url = source().resolved( url );
+
+     ba = helpEngine->fileData(url );
+   }
+   return ba;
+}
+
+void HelpBrowser::linkClicked( QUrl const & url )
+{
+  if( url.scheme() == "http" || url.scheme() == "https" )
+  {
+    QDesktopServices::openUrl( url );
+  }
+  else
+    setSource( url );
+}
+
+HelpWindow::HelpWindow( QWidget * parent, Config::Class & cfg_ ) :
+  QDialog( parent ),
+  cfg( cfg_ ),
+  helpEngine( 0 )
+{
+  resize( QSize( 600, 450 ) );
+  setWindowTitle( tr( "GoldenDict help" ) );
+  setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint );
+
+  QVBoxLayout * mainLayout = new QVBoxLayout( this );
+  setLayout( mainLayout );
+
+  navToolBar = new QToolBar( this );
+  navHome = navToolBar->addAction( QIcon( ":/icons/home.png" ), tr( "Home" ) );
+  navToolBar->widgetForAction( navHome )->setObjectName( "helpHomeButton" );
+  navBack = navToolBar->addAction( QIcon( ":/icons/previous.png" ), tr( "Back" ) );
+  navToolBar->widgetForAction( navBack )->setObjectName( "helpBackButton" );
+  navForward = navToolBar->addAction( QIcon( ":/icons/next.png" ), tr( "Forward" ) );
+  navToolBar->widgetForAction( navForward )->setObjectName( "helpForwardButton" );
+
+  navToolBar->addSeparator();
+
+  zoomInAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomin" ), tr( "Zoom In" ) );
+  navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomInButton" );
+  zoomOutAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomout" ), tr( "Zoom Out" ) );
+  navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomOutButton" );
+  zoomBaseAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoombase" ), tr( "Normal Size" ) );
+  navToolBar->widgetForAction( zoomBaseAction )->setObjectName( "zoomBaseButton" );
+
+  navForward->setEnabled( false );
+  navBack->setEnabled( false );
+
+  mainLayout->addWidget( navToolBar );
+
+  QString localeName = cfg.preferences.helpLanguage;
+
+  if( localeName.isEmpty() )
+    localeName = cfg.preferences.interfaceLanguage;
+
+  if( localeName.isEmpty() )
+    localeName = QLocale::system().name();
+
+  QString helpDir = Config::getHelpDir();
+  helpFile = QDir::toNativeSeparators( helpDir + "/gdhelp_" + localeName + ".qch" );
+
+  if( !QFileInfo( helpFile ).isFile() )
+    helpFile = QDir::toNativeSeparators( helpDir + "/gdhelp_" + localeName.left( 2 ) + ".qch" );
+
+  if( !QFileInfo( helpFile ).isFile() )
+    helpFile = QDir::toNativeSeparators( helpDir + "/gdhelp_en.qch" );
+
+  helpCollectionFile = QDir::toNativeSeparators( Config::getConfigDir() + "gdhelp.qhc" );
+
+  helpEngine = new QHelpEngine( helpCollectionFile );
+
+  if( !helpEngine->setupData() )
+  {
+    gdWarning( "Help engine initialization error: %s", helpEngine->error().toUtf8().data() );
+    delete helpEngine;
+    helpEngine = 0;
+  }
+  else
+  {
+    if( !helpEngine->registerDocumentation( helpFile ) )
+    {
+      gdWarning( "Help engine set file error: %s", helpEngine->error().toUtf8().data() );
+    }
+
+    tabWidget = new QTabWidget( this );
+    tabWidget->addTab( helpEngine->contentWidget(), tr( "Content" ) );
+    tabWidget->addTab( helpEngine->indexWidget(), tr( "Index" ) );
+
+    helpBrowser = new HelpBrowser( helpEngine, this );
+
+    helpBrowser->setOpenLinks( false );
+
+    connect( helpEngine->contentWidget(), SIGNAL( linkActivated( QUrl ) ),
+             helpBrowser, SLOT( setSource( QUrl ) ) );
+    connect( helpEngine->indexWidget(), SIGNAL( linkActivated( QUrl, QString ) ),
+             helpBrowser, SLOT( setSource( QUrl ) ) );
+
+    connect( navHome, SIGNAL( triggered() ), helpBrowser, SLOT( home() ) );
+    connect( navForward, SIGNAL( triggered() ), helpBrowser, SLOT( forward() ) );
+    connect( navBack, SIGNAL( triggered() ), helpBrowser, SLOT( backward() ) );
+
+    connect( helpBrowser, SIGNAL( forwardAvailable( bool ) ),
+             this, SLOT( forwardEnabled( bool ) ) );
+
+    connect( helpBrowser, SIGNAL( backwardAvailable( bool ) ),
+             this, SLOT( backwardEnabled( bool ) ) );
+
+    connect( helpEngine->contentWidget(), SIGNAL( clicked( QModelIndex ) ),
+             this, SLOT( contentsItemClicked( QModelIndex ) ) );
+
+    connect( zoomInAction, SIGNAL( triggered( ) ), this, SLOT( zoomIn() ) );
+    connect( zoomOutAction, SIGNAL( triggered( ) ), this, SLOT( zoomOut() ) );
+    connect( zoomBaseAction, SIGNAL( triggered( ) ), this, SLOT( zoomBase() ) );
+
+    splitter = new QSplitter( this );
+    splitter->addWidget( tabWidget );
+    splitter->addWidget( helpBrowser );
+
+    splitter->setStretchFactor( 0, 1 );
+    splitter->setStretchFactor( 1, 4 );
+    mainLayout->addWidget( splitter );
+  }
+
+  if( !cfg.helpWindowGeometry.isEmpty() )
+    restoreGeometry( cfg.helpWindowGeometry );
+  if( !cfg.helpSplitterState.isEmpty() )
+    splitter->restoreState( cfg.helpSplitterState );
+
+  QFont f = helpBrowser->font();
+  fontSize = f.pointSize();
+  if( fontSize < 10 )
+  {
+    fontSize = 10;
+    f.setPointSize( fontSize );
+    helpBrowser->setFont( f );
+  }
+
+  applyZoomFactor();
+}
+
+HelpWindow::~HelpWindow()
+{
+  if( helpEngine )
+    delete helpEngine;
+
+  QFile f( helpCollectionFile );
+  f.remove();
+}
+
+void HelpWindow::reject()
+{
+  cfg.helpWindowGeometry = saveGeometry();
+  cfg.helpSplitterState = splitter->saveState();
+  emit needClose();
+}
+
+void HelpWindow::accept()
+{
+  cfg.helpWindowGeometry = saveGeometry();
+  cfg.helpSplitterState = splitter->saveState();
+  emit needClose();
+}
+
+void HelpWindow::showHelpFor( QString const & keyword )
+{
+  helpBrowser->showHelpForKeyword( keyword );
+}
+
+void HelpWindow::forwardEnabled( bool enabled )
+{
+  navForward->setEnabled( enabled );
+}
+
+void HelpWindow::backwardEnabled( bool enabled )
+{
+  navBack->setEnabled( enabled );
+}
+
+void HelpWindow::contentsItemClicked( QModelIndex const & index )
+{
+  QHelpContentItem * item = helpEngine->contentModel()->contentItemAt( index );
+  if( !item->url().isEmpty() )
+    helpBrowser->setSource( item->url() );
+}
+
+void HelpWindow::zoomIn()
+{
+  cfg.preferences.helpZoomFactor += 0.2;
+  applyZoomFactor();
+}
+
+void HelpWindow::zoomOut()
+{
+  cfg.preferences.helpZoomFactor -= 0.2;
+  applyZoomFactor();
+}
+
+void HelpWindow::zoomBase()
+{
+  cfg.preferences.helpZoomFactor = 1;
+  applyZoomFactor();
+}
+
+void HelpWindow::applyZoomFactor()
+{
+  if ( cfg.preferences.helpZoomFactor >= 5 )
+    cfg.preferences.helpZoomFactor = 5;
+  else if ( cfg.preferences.helpZoomFactor <= 0.2 )
+    cfg.preferences.helpZoomFactor = 0.2;
+
+  zoomInAction->setEnabled( cfg.preferences.helpZoomFactor < 5 );
+  zoomOutAction->setEnabled( cfg.preferences.helpZoomFactor > 0.2 );
+  zoomBaseAction->setEnabled( cfg.preferences.helpZoomFactor != 1.0 );
+
+  if( fontSize > 0 )
+  {
+    QFont f = helpBrowser->font();
+    f.setPointSize( fontSize * cfg.preferences.helpZoomFactor );
+    helpBrowser->setFont( f );
+  }
+}
+
+} // namespace Help
diff -Nru goldendict-1.5.0~git20131003/helpwindow.hh goldendict-1.5.0~git20150923/helpwindow.hh
--- goldendict-1.5.0~git20131003/helpwindow.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/helpwindow.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,79 @@
+#ifndef __HELPWINDOW_HH_INCLUDED__
+#define __HELPWINDOW_HH_INCLUDED__
+
+#include <QDialog>
+#include <QToolBar>
+#include <QtHelp/QHelpEngine>
+#include <QString>
+#include <QTextBrowser>
+#include <QTableWidget>
+#include <QAction>
+#include <QSplitter>
+
+#include <exception>
+
+#include "config.hh"
+
+namespace Help {
+
+class HelpBrowser : public QTextBrowser
+{
+Q_OBJECT
+public:
+  HelpBrowser( QHelpEngineCore * engine, QWidget *parent );
+  void showHelpForKeyword( QString const & id );
+private:
+  QVariant loadResource( int type, QUrl const & name );
+  QHelpEngineCore * helpEngine;
+
+private slots:
+  void linkClicked( QUrl const & url );
+};
+
+
+class HelpWindow : public QDialog
+{
+Q_OBJECT
+
+  Config::Class & cfg;
+  QToolBar * navToolBar;
+  QHelpEngine * helpEngine;
+  QTabWidget * tabWidget;
+  HelpBrowser * helpBrowser;
+  QAction * navForward, * navBack, * navHome;
+  QAction * zoomInAction, * zoomOutAction, * zoomBaseAction;
+  QSplitter * splitter;
+
+  QString helpFile, helpCollectionFile;
+
+  int fontSize;
+
+  void applyZoomFactor();
+
+public:
+  HelpWindow( QWidget * parent, Config::Class & cfg_ );
+  ~HelpWindow();
+
+  QHelpEngine const * getHelpEngine()
+  { return helpEngine; }
+
+  void showHelpFor( QString const & keyword );
+
+public slots:
+  virtual void reject();
+  virtual void accept();
+  void forwardEnabled( bool enabled );
+  void backwardEnabled( bool enabled );
+  void contentsItemClicked( QModelIndex const & index );
+
+  void zoomIn();
+  void zoomOut();
+  void zoomBase();
+
+signals:
+  void needClose();
+};
+
+} // namespace Help
+
+#endif // __HELPWINDOW_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/hotkeyedit.cc goldendict-1.5.0~git20150923/hotkeyedit.cc
--- goldendict-1.5.0~git20131003/hotkeyedit.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/hotkeyedit.cc	2015-09-23 08:26:24.000000000 +0000
@@ -10,6 +10,7 @@
   continuingCombo( false )
 {
   renderCurrentValue();
+  installEventFilter( this );
 }
 
 void HotKeyEdit::setHotKey( Config::HotKey const & hk )
@@ -38,10 +39,10 @@
 
   if ( currentKey1 )
   {
-    result = QKeySequence( currentKey1 | currentModifiers ).toString( QKeySequence::PortableText );
+    result = QKeySequence( currentKey1 | currentModifiers ).toString( QKeySequence::NativeText );
 
     if ( currentKey2 )
-     result += "+" + QKeySequence( currentKey2 ).toString( QKeySequence::PortableText );
+     result += "+" + QKeySequence( currentKey2 ).toString( QKeySequence::NativeText );
   }
 
   setText( result );
@@ -117,3 +118,12 @@
   QLineEdit::keyReleaseEvent( event );
 }
 
+bool HotKeyEdit::eventFilter( QObject *, QEvent * event )
+{
+  if( event->type() == QEvent::ShortcutOverride )
+  {
+    event->accept();
+    return true;
+  }
+  return false;
+}
diff -Nru goldendict-1.5.0~git20131003/hotkeyedit.hh goldendict-1.5.0~git20150923/hotkeyedit.hh
--- goldendict-1.5.0~git20131003/hotkeyedit.hh	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/hotkeyedit.hh	2015-09-23 08:26:24.000000000 +0000
@@ -32,6 +32,7 @@
 private:
 
   void renderCurrentValue();
+  bool eventFilter( QObject *, QEvent * event );
 };
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/hotkeywrapper.cc goldendict-1.5.0~git20150923/hotkeywrapper.cc
--- goldendict-1.5.0~git20131003/hotkeywrapper.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/hotkeywrapper.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,22 +4,32 @@
 #endif
 
 #include "hotkeywrapper.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 #ifdef Q_WS_X11
 #include <X11/Xlibint.h>
 #endif
 
+#ifdef Q_OS_WIN32
+#include "mainwindow.hh"
+#endif
+
 //////////////////////////////////////////////////////////////////////////
 
 QHotkeyApplication::QHotkeyApplication( int & argc, char ** argv ):
   QtSingleApplication( argc, argv )
+#ifdef Q_OS_WIN32
+,  mainWindow( 0 )
+#endif
 {
 }
 
 QHotkeyApplication::QHotkeyApplication( QString const & id,
                                         int & argc, char ** argv ):
   QtSingleApplication( id, argc, argv )
+#ifdef Q_OS_WIN32
+,  mainWindow( 0 )
+#endif
 {
 }
 
@@ -60,7 +70,7 @@
   modifier( modifier_ ),
   handle( handle_ ),
   id( id_ )
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MAC
   , hkRef( 0 )
   , hkRef2( 0 )
 #endif
@@ -383,6 +393,12 @@
     }
   }
 
+  if( mainWindow )
+  {
+    if( ( static_cast< MainWindow * >( mainWindow ) )->handleGDMessage( message, result ) )
+      return true;
+  }
+
   return QApplication::winEventFilter( message, result );
 }
 
@@ -465,7 +481,7 @@
   if ( !XRecordEnableContext( dataDisplay, recordContext,
                               recordEventCallback,
                               (XPointer) this ) )
-    DPRINTF( "Failed to enable record context\n" );
+    GD_DPRINTF( "Failed to enable record context\n" );
 }
 
 
diff -Nru goldendict-1.5.0~git20131003/hotkeywrapper.hh goldendict-1.5.0~git20150923/hotkeywrapper.hh
--- goldendict-1.5.0~git20131003/hotkeywrapper.hh	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/hotkeywrapper.hh	2015-09-23 08:26:24.000000000 +0000
@@ -13,7 +13,7 @@
 
 #endif
 
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MAC
 #define __SECURITYHI__
 #include <Carbon/Carbon.h>
 #endif
@@ -32,7 +32,7 @@
   quint32 modifier;
   int handle;
   int id;
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MAC
   EventHotKeyRef hkRef, hkRef2;
 #endif
 };
@@ -69,7 +69,7 @@
 
   void waitKey2();
 
-#ifndef Q_OS_MACX
+#ifndef Q_OS_MAC
 private slots:
 
   bool checkState( quint32 vk, quint32 mod );
@@ -89,7 +89,7 @@
   virtual bool winEvent ( MSG * message, long * result );
   HWND hwnd;
 
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_MAC)
 
 public:
   void activated( int hkId );
@@ -208,6 +208,11 @@
 
 #ifdef Q_OS_WIN32
   virtual bool winEventFilter ( MSG * message, long * result );
+  QWidget * mainWindow;
+public:
+  void setMainWindow( QWidget * widget )
+  { mainWindow = widget; }
+protected:
 #endif
 
   QList<HotkeyWrapper*> hotkeyWrappers;
diff -Nru goldendict-1.5.0~git20131003/htmlescape.cc goldendict-1.5.0~git20150923/htmlescape.cc
--- goldendict-1.5.0~git20131003/htmlescape.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/htmlescape.cc	2015-09-23 08:26:24.000000000 +0000
@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QTextDocumentFragment>
+#include <QRegExp>
 #include "htmlescape.hh"
 
 namespace Html {
@@ -136,17 +137,26 @@
   return result;
 }
 
-QString unescape( QString const & str )
+QString unescape( QString const & str, bool saveFormat )
 {
   // Does it contain HTML? If it does, we need to strip it
   if ( str.contains( '<' ) || str.contains( '&' ) )
-    return QTextDocumentFragment::fromHtml( str ).toPlainText();
+  {
+    QString tmp = str;
+    if( !saveFormat )
+    {
+      tmp.replace( QRegExp( "<(?:\\s*(?:div|p(?![alr])|br|li(?![ns])|td|blockquote|/ol))[^>]{0,}>",
+                            Qt::CaseInsensitive, QRegExp::RegExp2 ), " " );
+      tmp.remove( QRegExp( "<[^>]*>", Qt::CaseSensitive, QRegExp::RegExp2 ) );
+    }
+    return QTextDocumentFragment::fromHtml( tmp.trimmed() ).toPlainText();
+  }
   return str;
 }
 
-string unescapeUtf8( const string &str )
+string unescapeUtf8( const string &str, bool saveFormat )
 {
-  return string( unescape( QString::fromUtf8( str.c_str(), str.size() ) ).toUtf8().data() );
+  return string( unescape( QString::fromUtf8( str.c_str(), str.size() ) ).toUtf8().data(), saveFormat );
 }
 
 }
diff -Nru goldendict-1.5.0~git20131003/htmlescape.hh goldendict-1.5.0~git20150923/htmlescape.hh
--- goldendict-1.5.0~git20131003/htmlescape.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/htmlescape.hh	2015-09-23 08:26:24.000000000 +0000
@@ -23,8 +23,8 @@
 string escapeForJavaScript( string const & );
 
 // Replace html entities
-QString unescape( QString const & str );
-string unescapeUtf8( string const & str );
+QString unescape( QString const & str, bool saveFormat = false );
+string unescapeUtf8( string const & str, bool saveFormat = false );
 
 }
 
diff -Nru goldendict-1.5.0~git20131003/hunspell.cc goldendict-1.5.0~git20150923/hunspell.cc
--- goldendict-1.5.0~git20131003/hunspell.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/hunspell.cc	2015-09-23 08:26:24.000000000 +0000
@@ -17,7 +17,7 @@
 #include <QCoreApplication>
 #include <set>
 #include <hunspell/hunspell.hxx>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "fsencoding.hh"
 #include <QFileInfo>
 
@@ -34,6 +34,13 @@
   string name;
   Hunspell hunspell;
 
+#ifdef Q_OS_WIN32
+  static string Utf8ToLocal8Bit( string const & name )
+  {
+    return string( QString::fromUtf8( name.c_str() ).toLocal8Bit().data() );
+  }
+#endif
+
 public:
 
   /// files[ 0 ] should be .aff file, files[ 1 ] should be .dic file.
@@ -41,7 +48,11 @@
                       vector< string > const & files ):
     Dictionary::Class( id, files ),
     name( name_ ),
+#ifdef Q_OS_WIN32
+    hunspell( Utf8ToLocal8Bit( files[ 0 ] ).c_str(), Utf8ToLocal8Bit( files[ 1 ] ).c_str() )
+#else
     hunspell( files[ 0 ].c_str(), files[ 1 ].c_str() )
+#endif
   {
   }
 
@@ -72,6 +83,8 @@
   virtual bool isLocalDictionary()
   { return true; }
 
+  virtual vector< wstring > getAlternateWritings( const wstring & word ) throw();
+
 protected:
 
   virtual void loadIcon() throw();
@@ -99,6 +112,16 @@
 /// Iconv::Ex
 wstring decodeFromHunspell( Hunspell &, char const * );
 
+/// Generates suggestions via hunspell
+QVector< wstring > suggest( wstring & word, Mutex & hunspellMutex,
+                            Hunspell & hunspell );
+
+/// Generates suggestions for compound expression
+void getSuggestionsForExpression( wstring const & expression,
+                                  vector< wstring > & suggestions,
+                                  Mutex & hunspellMutex,
+                                  Hunspell & hunspell );
+
 /// Returns true if the string contains whitespace, false otherwise
 bool containsWhitespace( wstring const & str )
 {
@@ -131,6 +154,18 @@
   dictionaryIconLoaded = true;
 }
 
+vector< wstring > HunspellDictionary::getAlternateWritings( wstring const & word ) throw()
+{
+  vector< wstring > results;
+
+  if( containsWhitespace( word ) )
+  {
+    getSuggestionsForExpression( word, results, getHunspellMutex(), hunspell );
+  }
+
+  return results;
+}
+
 /// HunspellDictionary::getArticle()
 
 class HunspellArticleRequest;
@@ -281,11 +316,11 @@
   }
   catch( Iconv::Ex & e )
   {
-    qWarning( "Hunspell: charset convertion error, no processing's done: %s\n", e.what() );
+    gdWarning( "Hunspell: charset convertion error, no processing's done: %s\n", e.what() );
   }
   catch( std::exception & e )
   {
-    qWarning( "Hunspell: error: %s\n", e.what() );
+    gdWarning( "Hunspell: error: %s\n", e.what() );
   }
 
   if ( suggestions )
@@ -366,11 +401,6 @@
     isCancelled.ref();
     hasExited.acquire();
   }
-
-private:
-
-  /// Generates suggestions via hunspell
-  QVector< wstring > suggest( wstring & word );
 };
 
 void HunspellHeadwordsRequestRunnable::run()
@@ -398,58 +428,18 @@
 
   if ( containsWhitespace( trimmedWord ) )
   {
-    // Analyze each word separately and use the first suggestion, if any.
-    // This is useful for compound expressions where one of the words is
-    // in different form, e.g. "dozing off" -> "doze off".
-    // In this mode, we only provide a single suggestion at most.
-
-    wstring result;
-
-    wstring word;
-
-    for( wchar const * c = trimmedWord.c_str(); ; ++c )
-    {
-      if ( !*c || Folding::isPunct( *c ) || Folding::isWhitespace( * c ) )
-      {
-        if ( word.size() )
-        {
-          QVector< wstring > suggestions = suggest( word );
-
-          if ( suggestions.size() )
-            result += suggestions[ 0 ];
-          else
-            result += word;
+    vector< wstring > results;
 
-          word.clear();
-        }
-        if ( *c )
-          result.push_back( *c );
-        else
-          break;
-      }
-      else
-        word.push_back( *c );
-    }
+    getSuggestionsForExpression( trimmedWord, results, hunspellMutex, hunspell );
 
-    if ( word.size() )
-    {
-      QVector< wstring > suggestions = suggest( trimmedWord );
+    Mutex::Lock _( dataMutex );
+    for( unsigned i = 0; i < results.size(); i++ )
+      matches.push_back( results[ i ] );
 
-      if ( suggestions.size() )
-        result += suggestions[ 0 ];
-      else
-        result += word;
-    }
-
-    if ( result != trimmedWord )
-    {
-      Mutex::Lock _( dataMutex );
-      matches.push_back( result );
-    }
   }
   else
   {
-    QVector< wstring > suggestions = suggest( trimmedWord );
+    QVector< wstring > suggestions = suggest( trimmedWord, hunspellMutex, hunspell );
 
     if ( !suggestions.empty() )
     {
@@ -463,7 +453,7 @@
   finish();
 }
 
-QVector< wstring > HunspellHeadwordsRequest::suggest( wstring & word )
+QVector< wstring > suggest( wstring & word, Mutex & hunspellMutex, Hunspell & hunspell )
 {
   QVector< wstring > result;
 
@@ -491,7 +481,7 @@
       {
         QString suggestion = gd::toQString( decodeFromHunspell( hunspell, suggestions[ x ] ) );
 
-        DPRINTF( ">>>Sugg: %s\n", suggestion.toLocal8Bit().data() );
+        GD_DPRINTF( ">>>Sugg: %s\n", suggestion.toLocal8Bit().data() );
 
         if ( cutStem.indexIn( suggestion ) != -1 )
         {
@@ -499,7 +489,9 @@
 
           if ( Folding::applySimpleCaseOnly( alt ) != lowercasedWord ) // No point in providing same word
           {
+#ifdef QT_DEBUG
             qDebug() << ">>>>>Alt:" << gd::toQString( alt );
+#endif
             result.append( alt );
           }
         }
@@ -508,7 +500,7 @@
   }
   catch( Iconv::Ex & e )
   {
-    qWarning( "Hunspell: charset convertion error, no processing's done: %s\n", e.what() );
+    gdWarning( "Hunspell: charset convertion error, no processing's done: %s\n", e.what() );
   }
 
   if ( suggestions )
@@ -630,7 +622,7 @@
   }
   catch( Iconv::Ex & e )
   {
-    qWarning( "Hunspell: charset convertion error, no processing's done: %s\n", e.what() );
+    gdWarning( "Hunspell: charset convertion error, no processing's done: %s\n", e.what() );
   }
 
   finish();
@@ -643,6 +635,102 @@
   return new HunspellPrefixMatchRequest( word, getHunspellMutex(), hunspell );
 }
 
+void getSuggestionsForExpression( wstring const & expression,
+                                  vector<wstring> & suggestions,
+                                  Mutex & hunspellMutex,
+                                  Hunspell & hunspell )
+{
+  // Analyze each word separately and use the first two suggestions, if any.
+  // This is useful for compound expressions where some words is
+  // in different form, e.g. "dozing off" -> "doze off".
+
+  wstring trimmedWord = Folding::trimWhitespaceOrPunct( expression );
+  wstring word, punct;
+  QVector< wstring > words;
+
+  suggestions.clear();
+
+  // Parse string to separate words
+
+  for( wchar const * c = trimmedWord.c_str(); ; ++c )
+  {
+    if ( !*c || Folding::isPunct( *c ) || Folding::isWhitespace( * c ) )
+    {
+      if ( word.size() )
+      {
+        words.push_back( word );
+        word.clear();
+      }
+      if ( *c )
+        punct.push_back( *c );
+    }
+    else
+    {
+      if( punct.size() )
+      {
+        words.push_back( punct );
+        punct.clear();
+      }
+      if( *c )
+        word.push_back( *c );
+    }
+    if( !*c )
+      break;
+  }
+
+  if( words.size() > 21 )
+  {
+    // Too many words - no suggestions
+    return;
+  }
+
+  // Combine result strings from suggestions
+
+  QVector< wstring > results;
+
+  for( int i = 0; i < words.size(); i++ )
+  {
+    word = words.at( i );
+    if( Folding::isPunct( word[ 0 ] ) || Folding::isWhitespace( word[ 0 ] ) )
+    {
+      for( int j = 0; j < results.size(); j++ )
+        results[ j ].append( word );
+    }
+    else
+    {
+      QVector< wstring > sugg = suggest( word, hunspellMutex, hunspell );
+      int suggNum = sugg.size() + 1;
+      if( suggNum > 3 )
+        suggNum = 3;
+      int resNum = results.size();
+      wstring resultStr;
+
+      if( resNum == 0 )
+      {
+        for( int k = 0; k < suggNum; k++ )
+          results.push_back( k == 0 ? word : sugg.at( k - 1 ) );
+      }
+      else
+      {
+        for( int j = 0; j < resNum; j++ )
+        {
+          resultStr = results.at( j );
+          for( int k = 0; k < suggNum; k++ )
+          {
+            if( k == 0)
+              results[ j ].append( word );
+            else
+              results.push_back( resultStr + sugg.at( k - 1 ) );
+          }
+        }
+      }
+    }
+  }
+
+  for( int i = 0; i < results.size(); i++ )
+    if( results.at( i ) != trimmedWord )
+      suggestions.push_back( results.at( i ) );
+}
 
 string encodeToHunspell( Hunspell & hunspell, wstring const & str )
 {
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/icons/home.png and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/icons/home.png differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/icons/icon32_epwing.png and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/icons/icon32_epwing.png differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/icons/icon32_slob.png and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/icons/icon32_slob.png differ
diff -Nru goldendict-1.5.0~git20131003/indexedzip.cc goldendict-1.5.0~git20150923/indexedzip.cc
--- goldendict-1.5.0~git20131003/indexedzip.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/indexedzip.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,9 +4,10 @@
 #include "indexedzip.hh"
 #include "zipfile.hh"
 #include <zlib.h>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "utf8.hh"
 #include "iconv.hh"
+#include "wstring_qt.hh"
 
 #include <QDebug>
 
@@ -59,7 +60,7 @@
 
   if ( !ZipFile::readLocalHeader( zip, header ) )
   {
-    DPRINTF( "Failed to load header\n" );
+    GD_DPRINTF( "Failed to load header\n" );
     return false;
   }
 
@@ -68,13 +69,13 @@
   switch( header.compressionMethod )
   {
     case ZipFile::Uncompressed:
-      DPRINTF( "Uncompressed\n" );
+      GD_DPRINTF( "Uncompressed\n" );
       data.resize( header.uncompressedSize );
       return (size_t) zip.read( &data.front(), data.size() ) == data.size();
 
     case ZipFile::Deflated:
     {
-      DPRINTF( "Deflated\n" );
+      GD_DPRINTF( "Deflated\n" );
 
       // Now do the deflation
 
@@ -102,7 +103,7 @@
 
       if ( inflate( &stream, Z_FINISH ) != Z_STREAM_END )
       {
-        DPRINTF( "Not zstream end!" );
+        GD_DPRINTF( "Not zstream end!" );
 
         data.clear();
 
@@ -122,7 +123,7 @@
   }
 }
 
-bool IndexedZip::indexFile( BtreeIndexing::IndexedWords &zipFileNames )
+bool IndexedZip::indexFile( BtreeIndexing::IndexedWords &zipFileNames, quint32 * filesCount )
 {
     if ( !zipIsOpen )
         return false;
@@ -131,8 +132,15 @@
 
     // File seems to be a valid zip file
 
+
+    QTextCodec * localeCodec = QTextCodec::codecForLocale();
+
     ZipFile::CentralDirEntry entry;
 
+    bool alreadyCounted;
+    if( filesCount )
+      *filesCount = 0;
+
     while( ZipFile::readNextEntry( zip, entry ) )
     {
       if ( entry.compressionMethod == ZipFile::Unsupported )
@@ -161,16 +169,20 @@
           break;
       }
 
+      alreadyCounted = false;
+
       if ( !hasNonAscii )
       {
         // Add entry as is
 
         zipFileNames.addSingleWord( Utf8::decode( entry.fileName.data() ),
                                     entry.localHeaderOffset );
+        if( filesCount )
+          *filesCount += 1;
       }
       else
       {
-        // Try assuming different encodings. Those are UTF8 and two
+        // Try assuming different encodings. Those are UTF8, system locale and two
         // Russian ones (Windows and Windows OEM). Unfortunately, zip
         // files do not say which encoding they utilize.
 
@@ -181,38 +193,86 @@
 
           zipFileNames.addSingleWord( decoded,
                                       entry.localHeaderOffset );
+          if( filesCount != 0 && !alreadyCounted )
+          {
+            *filesCount += 1;
+            alreadyCounted = true;
+          }
         }
         catch( Utf8::exCantDecode )
         {
           // Failed to decode
         }
 
-        // CP866
-        try
+        if( !entry.fileNameInUTF8 )
         {
-          wstring decoded = Iconv::toWstring( "CP866", entry.fileName.constData(),
-                                              entry.fileName.size() );
+          wstring nameInSystemLocale;
 
-          zipFileNames.addSingleWord( decoded,
-                                      entry.localHeaderOffset );
-        }
-        catch( Iconv::Ex )
-        {
+          // System locale
+          if( localeCodec )
+          {
+            QString name = localeCodec->toUnicode( entry.fileName.constData(),
+                                                   entry.fileName.size() );
+            nameInSystemLocale = gd::toWString( name );
+            if( !nameInSystemLocale.empty() )
+            {
+              zipFileNames.addSingleWord( nameInSystemLocale,
+                                          entry.localHeaderOffset );
+
+              if( filesCount != 0 && !alreadyCounted )
+              {
+                *filesCount += 1;
+                alreadyCounted = true;
+              }
+            }
+          }
+
+
+          // CP866
+          try
+          {
+            wstring decoded = Iconv::toWstring( "CP866", entry.fileName.constData(),
+                                                entry.fileName.size() );
+
+            if( nameInSystemLocale.compare( decoded ) != 0 )
+            {
+              zipFileNames.addSingleWord( decoded,
+                                          entry.localHeaderOffset );
+
+              if( filesCount != 0 && !alreadyCounted )
+              {
+                *filesCount += 1;
+                alreadyCounted = true;
+              }
+            }
+          }
+          catch( Iconv::Ex )
+          {
+              // Failed to decode
+          }
+
+          // CP1251
+          try
+          {
+            wstring decoded = Iconv::toWstring( "CP1251", entry.fileName.constData(),
+                                                entry.fileName.size() );
+
+            if( nameInSystemLocale.compare( decoded ) != 0 )
+            {
+              zipFileNames.addSingleWord( decoded,
+                                          entry.localHeaderOffset );
+
+              if( filesCount != 0 && !alreadyCounted )
+              {
+                *filesCount += 1;
+                alreadyCounted = true;
+              }
+            }
+          }
+          catch( Iconv::Ex )
+          {
             // Failed to decode
-        }
-
-        // CP1251
-        try
-        {
-          wstring decoded = Iconv::toWstring( "CP1251", entry.fileName.constData(),
-                                              entry.fileName.size() );
-
-          zipFileNames.addSingleWord( decoded,
-                                      entry.localHeaderOffset );
-        }
-        catch( Iconv::Ex )
-        {
-          // Failed to decode
+          }
         }
       }
     }
diff -Nru goldendict-1.5.0~git20131003/indexedzip.hh goldendict-1.5.0~git20150923/indexedzip.hh
--- goldendict-1.5.0~git20131003/indexedzip.hh	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/indexedzip.hh	2015-09-23 08:26:24.000000000 +0000
@@ -39,7 +39,7 @@
   bool loadFile( uint32_t offset, std::vector< char > & );
 
   /// Index compressed files in zip file
-  bool indexFile( BtreeIndexing::IndexedWords &zipFileNames );
+  bool indexFile( BtreeIndexing::IndexedWords &zipFileNames, quint32 * filesCount = 0 );
 };
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/keyboardstate.cc goldendict-1.5.0~git20150923/keyboardstate.cc
--- goldendict-1.5.0~git20131003/keyboardstate.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/keyboardstate.cc	2015-09-23 08:26:24.000000000 +0000
@@ -10,7 +10,7 @@
 #include <QX11Info>
 #include <X11/X.h>
 #include <X11/XKBlib.h>
-#elif defined Q_OS_MACX
+#elif defined Q_OS_MAC
 #define __SECURITYHI__
 #include <Carbon/Carbon.h>
 #endif
@@ -32,7 +32,7 @@
     ( mask & LeftShift && !( GetAsyncKeyState( VK_LSHIFT ) & 0x8000 ) ) ||
     ( mask & RightShift && !( GetAsyncKeyState( VK_RSHIFT ) & 0x8000 ) ) );
 
-  #elif defined Q_OS_MACX
+  #elif defined Q_OS_MAC
   UInt32 keys = GetCurrentKeyModifiers();
   return !(
     ( mask & Alt && !( keys & ( 1 << optionKeyBit ) ) ) ||
diff -Nru goldendict-1.5.0~git20131003/lionsupport.h goldendict-1.5.0~git20150923/lionsupport.h
--- goldendict-1.5.0~git20131003/lionsupport.h	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/lionsupport.h	2015-09-23 08:26:24.000000000 +0000
@@ -15,6 +15,9 @@
      * Adds fullscreen button to window for Lion.
      */
     static void addFullscreen(MainWindow *window);
+
+    //Check for retina display
+    static bool isRetinaDisplay();
 };
 
 #endif // LIONSUPPORT_H
diff -Nru goldendict-1.5.0~git20131003/lionsupport.mm goldendict-1.5.0~git20150923/lionsupport.mm
--- goldendict-1.5.0~git20131003/lionsupport.mm	2012-10-01 07:15:20.000000000 +0000
+++ goldendict-1.5.0~git20150923/lionsupport.mm	2015-09-23 08:26:24.000000000 +0000
@@ -1,3 +1,5 @@
+#include <AppKit/NSWindow.h>
+#include <AppKit/NSScreen.h>
 #include "lionsupport.h"
 
 bool LionSupport::isLion()
@@ -20,3 +22,13 @@
 #warning No fullscreen support will be included in this build
 #endif
 }
+
+bool LionSupport::isRetinaDisplay()
+{
+#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+  return( [ [ NSScreen mainScreen ] respondsToSelector:@selector( backingScaleFactor ) ]
+          && [ [ NSScreen mainScreen ] backingScaleFactor ] > 1.5 );
+#else
+  return false;
+#endif
+}
diff -Nru goldendict-1.5.0~git20131003/loaddictionaries.cc goldendict-1.5.0~git20150923/loaddictionaries.cc
--- goldendict-1.5.0~git20131003/loaddictionaries.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/loaddictionaries.cc	2015-09-23 08:26:24.000000000 +0000
@@ -20,7 +20,7 @@
 #include "forvo.hh"
 #include "programs.hh"
 #include "voiceengines.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "fsencoding.hh"
 #include "xdxf.hh"
 #include "sdict.hh"
@@ -28,6 +28,12 @@
 #include "zipsounds.hh"
 #include "mdx.hh"
 #include "zim.hh"
+#include "dictserver.hh"
+#include "slob.hh"
+
+#ifndef NO_EPWING_SUPPORT
+#include "epwing.hh"
+#endif
 
 #include <QMessageBox>
 #include <QDir>
@@ -53,7 +59,10 @@
               << "*.xdxf.dz" << "*.dct" << "*.aar" << "*.zips"
               << "*.mdx"
 #ifdef MAKE_ZIM_SUPPORT
-              << "*.zim" << "*.zimaa"
+              << "*.zim" << "*.zimaa" << "*.slob"
+#endif
+#ifndef NO_EPWING_SUPPORT
+              << "*catalogs"
 #endif
 ;
 }
@@ -199,6 +208,22 @@
     dictionaries.insert( dictionaries.end(), zimDictionaries.begin(),
                          zimDictionaries.end() );
   }
+  {
+    vector< sptr< Dictionary::Class > > slobDictionaries =
+      Slob::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
+
+    dictionaries.insert( dictionaries.end(), slobDictionaries.begin(),
+                         slobDictionaries.end() );
+  }
+#endif
+#ifndef NO_EPWING_SUPPORT
+  {
+    vector< sptr< Dictionary::Class > > epwingDictionaries =
+      Epwing::makeDictionaries( allFiles, FsEncoding::encode( Config::getIndexDir() ), *this );
+
+    dictionaries.insert( dictionaries.end(), epwingDictionaries.begin(),
+                         epwingDictionaries.end() );
+  }
 #endif
 }
 
@@ -318,14 +343,35 @@
     dictionaries.insert( dictionaries.end(), dicts.begin(), dicts.end() );
   }
 
-  DPRINTF( "Load done\n" );
+  {
+    vector< sptr< Dictionary::Class > > dicts =
+      DictServer::makeDictionaries( cfg.dictServers );
+
+    dictionaries.insert( dictionaries.end(), dicts.begin(), dicts.end() );
+  }
+
+  GD_DPRINTF( "Load done\n" );
 
   // Remove any stale index files
 
   set< string > ids;
+  std::pair< std::set< string >::iterator, bool > ret;
+
+  QTextCodec::setCodecForCStrings( QTextCodec::codecForName( "UTF8" ) );
 
   for( unsigned x = dictionaries.size(); x--; )
-    ids.insert( dictionaries[ x ]->getId() );
+  {
+    ret = ids.insert( dictionaries[ x ]->getId() );
+    if( !ret.second )
+    {
+      gdWarning( "Duplicate dictionary ID found: ID=%s, name=\"%s\", path=\"%s\"",
+                 dictionaries[ x ]->getId().c_str(),
+                 dictionaries[ x ]->getName().c_str(),
+                 dictionaries[ x ]->getDictionaryFilenames().empty() ?
+                   "" : dictionaries[ x ]->getDictionaryFilenames()[ 0 ].c_str()
+                );
+    }
+  }
 
   QDir indexDir( Config::getIndexDir() );
 
@@ -334,8 +380,13 @@
   for( QStringList::const_iterator i = allIdxFiles.constBegin();
        i != allIdxFiles.constEnd(); ++i )
   {
-    if ( ids.find( FsEncoding::encode( *i ) ) == ids.end() &&
-         i->size() == 32 )
+    if ( ids.find( FsEncoding::encode( *i ) ) == ids.end()
+         && i->size() == 32 )
+      indexDir.remove( *i );
+    else
+    if ( i->endsWith( "_FTS" )
+         && i->size() == 36
+         && ids.find( FsEncoding::encode( i->left( 32 ) ) ) == ids.end() )
       indexDir.remove( *i );
   }
 
diff -Nru goldendict-1.5.0~git20131003/locale/ar_SA.ts goldendict-1.5.0~git20150923/locale/ar_SA.ts
--- goldendict-1.5.0~git20131003/locale/ar_SA.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/ar_SA.ts	2015-09-23 08:26:24.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ar_SA">
+<TS version="2.0" language="ar">
 <context>
     <name>About</name>
     <message>
@@ -11,137 +11,133 @@
     <message>
         <location filename="../about.ui" line="66"/>
         <source>GoldenDict dictionary lookup program, version </source>
-        <translation>برنامج القاموس الذهبي للبحث في القواميس, الاصدار</translation>
+        <translation>برنامج القاموس الذهبي للبحث في القواميس، الإصدار </translation>
     </message>
     <message>
         <location filename="../about.ui" line="91"/>
         <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
-        <translation type="unfinished">(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
-    </message>
-    <message>
-        <location filename="../about.ui" line="125"/>
-        <source>Credits:</source>
-        <translation>المساهمون:</translation>
-    </message>
-    <message>
-        <source>#.#</source>
-        <translation type="obsolete">#.#</translation>
+        <translation>(c) 2008-2013 قسطنطين ايزاكوف (ikm@goldendict.org)</translation>
     </message>
     <message>
         <location filename="../about.ui" line="101"/>
         <source>Licensed under GNU GPLv3 or later</source>
-        <translation>مرخص وفق GNU GPLv3 أو أحدث</translation>
+        <translation>مرخص وفق الإصدار الثّالث من رُخصة غنّو أو أحدث</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="125"/>
+        <source>Credits:</source>
+        <translation>إشادات:</translation>
     </message>
     <message>
         <location filename="../about.cc" line="17"/>
         <source>[Unknown]</source>
-        <translation>[مجهول]</translation>
+        <translation>[غير معروف]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>مبني على كيوتي %1 (%2، %3 بت)</translation>
     </message>
 </context>
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>وسّع المقالة</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>اطوِ المقالة</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-        <translation>لم يجد ترجمة لـ &lt;b&gt;%1&lt;/b&gt; في المجموعة &lt;b&gt;%2&lt;/b&gt;.</translation>
+        <translation>تعذّر إيجاد ترجمة لـ &lt;b&gt;%1&lt;/b&gt; في المجموعة &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation>لم يُعثر على ترجمة في مجموعة &lt;b&gt;%1&lt;/b&gt;.</translation>
+        <translation>تعذّر إيجاد ترجمة في مجموعة &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
-        <translation>مرحبا!</translation>
+        <translation>مرحبًا بك!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
-        <translation type="unfinished">ت&lt;h3 align=&quot;center&quot;&gt;مرحبا في &lt;b&gt;القاموس الذهبي&lt;/b&gt;!&lt;p&gt;لتبدأ العمل مع البرنامج، اذهب إلى &lt;b&gt;تحرير|قواميس&lt;/b&gt; لاضافة بعض مسارات القواميس لأبحث فيها، اعدّ قواميس ويكيبيديا متنوعة أو مصادر  أخرى، غير ترتيب القواميس أو أنشئ مجموعة للقواميس.&lt;p&gt;وعندها انت جاهز للبحث عن كلمات! يمكنك عمل ذلك من هذه النافذة باستخدام اللوح الأيمن، أو يمكنك &lt;a href=&quot;Working with popup&quot;&gt; البحث عن كلمات أثناء عملك على برامج أخرى &lt;/a&gt;. &lt;p&gt; لتخصيص برنامج، تحقق من التفضيلات عند &lt;b&gt;تحرير|تفضيلات &lt;/b&gt;. كل الاعدادات هناك لها تلمحيات، تأكد من قرائتها إن كنت في شك من أي شيء.&lt;p&gt;ان احتجت لمزيد من المساعدة، أو عندك أي سؤال، اقتراح أو تريد أن تعرف ماذا يقول الآخرون، فأنت مرحب بك في في &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;منتدى&lt;/a&gt; البرنامج. &lt;p&gt;تحقق من &lt;a href=&quot;http://goldendict.org/&quot;&gt;موقع&lt;/a&gt; البرنامج لأجل التحديثات. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. مرخص تحت GPLv3 أو أحدث.</translation>
+        <translation>&lt;h3 dir=&quot;RTL&quot; align=&quot;center&quot;&gt;مرحبًا بك في &lt;b&gt;القاموس الذهبي&lt;/b&gt;!&lt;/h3&gt;&lt;p dir=&quot;RTL&quot;&gt;لبدأ العمل مع البرنامج، زُر أولًا &lt;b&gt;حرّر|قواميس&lt;/b&gt; لإضافة بعض مسارات القواميس حيث يُبحث فيها عن ملفات القواميس، إعداد مواقع ويكيبيديا شتّى أو مصادر أخرى، ضبط ترتيب القواميس أو إنشاء مجموعات قواميس.&lt;p dir=&quot;RTL&quot;&gt;ثمَّ ستكون جاهزًا للبحث عن الكلمات! يمكنك فعل ذلك في الناقذة باستخدام اللوحة على اليمين، أو يمكنك &lt;a href=&quot;Working with popup&quot;&gt;البحث عن الكلمات من تطبيقات نشطة أخرى&lt;/a&gt;. &lt;p dir=&quot;RTL&quot;&gt;لتخصيص البرنامج، اكتشف التفضيلات المتوفّرة في &lt;b&gt;حرّر|تفضيلات&lt;/b&gt;. كل الإعدادات هناك تملك تلميحات، تأكّد من قرائتها إن كنت تشكّ في أي شيء.&lt;p dir=&quot;RTL&quot;&gt;إن احتجت إلى مزيدٍ من المعلومات، لديك بعض الأسئلة، اقتراحات أو تتسائل فيما يفكّر الغير، نرحّب بك دائمًا في &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;منتدى&lt;/a&gt; البرنامج.&lt;p dir=&quot;RTL&quot;&gt;تحقّق من &lt;a href=&quot;http://goldendict.org/&quot;&gt;موقع وِب&lt;/a&gt; البرنامج للتحديثات.&lt;p dir=&quot;RTL&quot;&gt;حقوق النشر 2008-2013 كونستانتين إيساكوف. مرخّص وفق رخصة جنو العمومية الإصدار 3 أو أحدث.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>العمل مع المنبثقات</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
-        <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;العمل مع المنبثقات&lt;/h3&gt;لنظر كلمة من برنامج نشط آخر, عليك أولا تفعيل &lt;i&gt;&quot;خاصية منبثقة المسح&quot;&lt;/i&gt; في &lt;b&gt;التفضيلات&lt;/b&gt;, ثم تفعيلها في أي وقت إما بضغط أيقونة ‘المنبثقة‘ فوق, أو بالنقر على أيقونة  الزاوية بزر الفأرة الأيمن واختيار ذلك من القائمة التي أظهرتها. </translation>
+        <translation>&lt;h3 dir=&quot;RTL&quot; align=&quot;center&quot;&gt;العمل مع المنبثقة&lt;/h3&gt;&lt;p dir=&quot;RTL&quot;&gt;للبحث عن الكلمات في تطبيقات نشطة أخرى، عليك أولًا تفعيل &lt;i&gt;&quot;وظيفة منبثقة الاستكشاف&quot;&lt;/i&gt; في &lt;b&gt;تفضيلات&lt;/b&gt;، ثمّ مكّنها في أي وقت بإطلاق أيقونة &quot;منبثقة&quot; بالأعلى، أو بنقر أيقونة صينية النظام بزر الفأرة الأيمن واختيارها في القائمة التي ظهرت.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
-        <translation>ثم اوقف المؤشر على الكلمة التي تريد نظرها في البرنامج الآخر, و ستنبثق نافذة تصفها لك.</translation>
+        <translation>&lt;p dir=&quot;RTL&quot;&gt;ثمَّ أوقف فقط المؤشر على الكلمة التي تريد البحث عنها في التطبيق الآخر، وستنبثق نافذة تصِف لكَ الكلمة.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
-        <translation>ثم اختر أية كلمة لنظرها في البرنامج الآخر بالفأرة (نقرتين عليها او حددها بالفأرة و الزر مضغوط), و ستظهر لك نافذة تصفها لك.</translation>
+        <translation>&lt;p dir=&quot;RTL&quot;&gt;ثمَّ حدّد فقط أي كلمة تريد البحث عنها في التطبيق الآخر بالفأرة (انقر مزدوجًا أو مرّرها بالفأرة أثناء ضغط الزر)، وستنبثق نافذة تصِف لكَ الكلمة.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
-        <translation>(بلا عنوان)</translation>
+        <translation>(غير معنون)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
-        <translation type="unfinished"></translation>
+        <translation>(صورة)</translation>
     </message>
 </context>
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>وسّع المقالة</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>من</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>اطوِ المقالة</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
-        <translation>أخطاء الطلب: %1</translation>
+        <translation>خطأ استعلام: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
-        <translation type="unfinished">كلمات قريبة:</translation>
+        <translation>الكلمات القريبة:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
-        <translation type="unfinished">تعبيرات مركبة:</translation>
+        <translation>التعابير المركّبة:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
-        <translation type="unfinished">كلمات مفردة:</translation>
+        <translation>الكلمات مفردةً: </translation>
     </message>
 </context>
 <context>
@@ -149,236 +145,227 @@
     <message>
         <location filename="../articleview.ui" line="14"/>
         <source>Form</source>
-        <translation>صيغة</translation>
+        <translation>نموذج</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
-        <translation>about:blank</translation>
+        <translation>حول:فارغ</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
-        <source>x</source>
-        <translation>x</translation>
+        <location filename="../articleview.ui" line="132"/>
+        <source>Find:</source>
+        <translation>اعثر على:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
-        <source>Find:</source>
-        <translation>ابحث:</translation>
+        <location filename="../articleview.ui" line="142"/>
+        <source>x</source>
+        <translation>س</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>ال&amp;سابق</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
-        <translation>ال&amp;لاحق</translation>
+        <translation>ال&amp;تالي</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
-        <source>&amp;Case Sensitive</source>
-        <translation>&amp;حساس للحالة</translation>
+        <location filename="../articleview.ui" line="197"/>
+        <source>Highlight &amp;all</source>
+        <translation>أبرز ال&amp;كل</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
-        <source>Highlight &amp;all</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.ui" line="220"/>
+        <source>&amp;Case Sensitive</source>
+        <translation>ح&amp;سّاس للحالة</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
-        <translation type="unfinished"></translation>
+        <translation>حدّد المقالة الحالية</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
-        <translation type="unfinished"></translation>
+        <translation>انسخ كنص</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
-        <translation type="unfinished"></translation>
+        <translation>افحص</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
-        <translation type="unfinished"></translation>
+        <translation>المورد</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>الصوت</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>صوت قراءة النّصوص</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
-        <translation type="unfinished"></translation>
+        <translation>الصورة</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
-        <source>Definition from dictionary &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="913"/>
+        <source>Video</source>
+        <translation>المرئيات</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
-        <source>Definition: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="922"/>
+        <source>Video: %1</source>
+        <translation>المقطع المرئي: %1</translation>
     </message>
     <message>
-        <source>GoldenDict</source>
-        <translation type="obsolete">القاموس الذهبي</translation>
+        <location filename="../articleview.cc" line="939"/>
+        <source>Definition from dictionary &quot;%1&quot;: %2</source>
+        <translation>التّعريف من القاموس &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="943"/>
+        <source>Definition: %1</source>
+        <translation>تعريف: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
-        <translation>المرجع المشار إليه غير موجود.</translation>
+        <translation>المورد المشار إليه غير موجود.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>برنامج الصوت المشار إليه غير موجود.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../articleview.cc" line="1463"/>
-        <source>Save sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../articleview.cc" line="1465"/>
-        <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../articleview.cc" line="1480"/>
-        <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
-        <translation>ا&amp;فتح الرابط</translation>
+        <translation>ا&amp;فتح الوصلة</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="1470"/>
+        <source>Open Link in New &amp;Tab</source>
+        <translation>افتح الوصلة في &amp;لسان جديد</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
-        <source>Video: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="1477"/>
+        <source>Open Link in &amp;External Browser</source>
+        <translation>افتح الوصلة في متصفّح &amp;خارجي</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
-        <source>Open Link in New &amp;Tab</source>
-        <translation>افتح الرابط في لسا&amp;ن جديد</translation>
+        <location filename="../articleview.cc" line="1492"/>
+        <source>Save &amp;image...</source>
+        <translation>احفظ ال&amp;صّورة...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
-        <source>Open Link in &amp;External Browser</source>
-        <translation>افتح الرابط في &amp;متصفح خارجي</translation>
+        <location filename="../articleview.cc" line="1500"/>
+        <source>Save s&amp;ound...</source>
+        <translation>احفظ الصّو&amp;ت...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
-        <translation>ا&amp;نظر &quot;%1&quot;</translation>
+        <translation>اب&amp;حث عن &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
-        <translation>انظر &quot;%1&quot; في &amp;لسان جديد</translation>
+        <translation>ابحث عن &quot;%1&quot; في لسان &amp;جديد</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
-        <translation type="unfinished"></translation>
+        <translation>أرسل &quot;%1&quot; إلى سطر الإدخال</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
-        <translation type="unfinished"></translation>
+        <translation>أ&amp;ضف &quot;%1&quot; إلى التأريخ</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
-        <translation>انظر &quot;%1&quot; في %2</translation>
+        <translation>ابحث عن &quot;%1&quot; في %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
-        <translation>انظر &quot;%1&quot;في %2 في لسان &amp;جديد</translation>
+        <translation>ابحث عن &quot;%1&quot; في %2 في لسان &amp;جديد</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
-        <source>WARNING: FFmpeg Audio Player: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="1704"/>
+        <source>Save sound</source>
+        <translation>احفظ الصوت</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1706"/>
+        <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
+        <translation>ملفات صوت (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;كل الملفات (*.*)</translation>
     </message>
     <message>
-        <source>Playing a non-WAV file</source>
-        <translation type="obsolete">تشغيل ملف غير WAV</translation>
+        <location filename="../articleview.cc" line="1719"/>
+        <source>Save image</source>
+        <translation>احفظ الصّورة</translation>
     </message>
     <message>
-        <source>To enable playback of files different than WAV, please go to Edit|Preferences, choose the Audio tab and select &quot;Play via DirectShow&quot; there.</source>
-        <translation type="obsolete">لتمكين تشغيل ملفات غير WAV، اذهب إلى تحرير|تفضيلات، اختر لسان الصوت وانتق &quot;شغل عبر DirectShow&quot; من هناك.</translation>
+        <location filename="../articleview.cc" line="1721"/>
+        <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
+        <translation>ملفات صورة (*.bmp *.jpg *.png *.tif);;كل الملفات (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
-        <translation>فشل بدء مشغل لتشغيل ملف الصوت: %1</translation>
+        <translation>فشل فتح مشغّل لملف الصّوت: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
-        <translation>فشل إنشاء ملف مؤقت.</translation>
+        <translation>فشل في إنشاء ملف مؤقت.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
-        <translation>تعذر فتح ملف المصدر آليا, حاول فتحه يدويا: %1.</translation>
-    </message>
-    <message>
-        <location filename="../articleview.cc" line="1604"/>
-        <source>The referenced resource failed to download.</source>
-        <translation>فشل تنزيل المرجع المشار إليه.</translation>
+        <translation>فشل في فتح ملف المورد تلقائيًّا، حاول فتحه يدويًّا: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
-        <source>Save &amp;image...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="1845"/>
+        <source>WARNING: %1</source>
+        <translation>تحذير: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
-        <source>Save s&amp;ound...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../articleview.cc" line="1845"/>
+        <source>The referenced resource failed to download.</source>
+        <translation>فشل تنزيل المورد المشار إليه.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
-        <source>WARNING: %1</source>
-        <translation type="unfinished">تحذير: %1</translation>
+        <location filename="../articleview.cc" line="1852"/>
+        <source>WARNING: FFmpeg Audio Player: %1</source>
+        <translation>تحذير: مشغّل FFmpeg الصوتي: %1</translation>
     </message>
 </context>
 <context>
@@ -386,26 +373,49 @@
     <message>
         <location filename="../belarusiantranslit.cc" line="417"/>
         <source>Belarusian transliteration from latin to cyrillic (classic orthography)</source>
-        <translation type="unfinished"></translation>
+        <translation>النّقل الحرفي البيلاروسي من اللاتينية إلى السيريلية (قواعد الإملاء التّقليدية)</translation>
     </message>
     <message>
         <location filename="../belarusiantranslit.cc" line="420"/>
         <source>Belarusian transliteration from latin to cyrillic (school orthography)</source>
-        <translation type="unfinished"></translation>
+        <translation>النّقل الحرفي البيلاروسي من اللاتينية إلى السيريلية (قواعد الإملاء المدرسية)</translation>
     </message>
     <message>
         <location filename="../belarusiantranslit.cc" line="423"/>
         <source>Belarusian transliteration (smoothes out the difference
 between classic and school orthography in cyrillic)</source>
+        <translation>النّقل الحرفي البيلاروسي (ينعّم الفوارق بين قواعد الإملاء التّقليدية والمدرسية في السيريلية)</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">كلمة المرور:</translation>
+    </message>
 </context>
 <context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>صيغة</translation>
+        <translation>نموذج</translation>
     </message>
     <message>
         <location filename="../dictgroupwidget.ui" line="37"/>
@@ -415,42 +425,42 @@
     <message>
         <location filename="../dictgroupwidget.ui" line="85"/>
         <source>Shortcut:</source>
-        <translation type="unfinished">الاختصار:</translation>
+        <translation>الاختصار:</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="38"/>
         <source>None</source>
-        <translation type="unfinished">لاشيء</translation>
+        <translation>لا شيء</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="43"/>
         <source>From file...</source>
-        <translation type="unfinished">من ملف...</translation>
+        <translation>من ملف...</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="90"/>
         <source>Choose a file to use as group icon</source>
-        <translation type="unfinished">اختر ملفا ليستخدم كرمز للمجموعة</translation>
+        <translation>اختر ملفًا لاستخدامه كرمز للمجموعة</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="92"/>
         <source>Images</source>
-        <translation type="unfinished">صور</translation>
+        <translation>الصور</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="93"/>
         <source>All files</source>
-        <translation type="unfinished">كل الملفات</translation>
+        <translation>كل الملفات</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="100"/>
         <source>Error</source>
-        <translation type="unfinished">خطأ</translation>
+        <translation>خطأ</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="100"/>
         <source>Can&apos;t read the specified image file.</source>
-        <translation type="unfinished">تعذر قراءة ملف الصورة المحدد.</translation>
+        <translation>تعذّر قراءة ملف الصورة المحدّد.</translation>
     </message>
 </context>
 <context>
@@ -461,92 +471,215 @@
         <location filename="../groups_widgets.cc" line="838"/>
         <location filename="../groups_widgets.cc" line="1013"/>
         <source>Dictionaries: </source>
-        <translation type="unfinished"></translation>
+        <translation>القواميس:</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="690"/>
         <source>Confirmation</source>
-        <translation type="unfinished">التأكد</translation>
+        <translation>التّأكيد</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="691"/>
         <source>Are you sure you want to generate a set of groups based on language pairs?</source>
-        <translation type="unfinished">أمتأكد من رغبتك بتوليد مجموعات حسب أزواج اللغة؟</translation>
+        <translation>هل أنت متأكد من توليد مجموعة مجموعات مبنية على زوجي اللّغة؟</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="716"/>
         <source>Unassigned</source>
-        <translation type="unfinished"></translation>
+        <translation>غير مُعيّن</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="854"/>
         <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>ادمج المجموعات باللغة المصدر إلى &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="871"/>
         <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>ادمج المجموعات باللغة الهدف إلى &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="889"/>
         <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>أنشئ مجموعة ترجمة من جهتين &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="907"/>
         <location filename="../groups_widgets.cc" line="926"/>
         <source>Combine groups with &quot;%1&quot;</source>
+        <translation>ادمج المجموعات بـ &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">ملفات نص (*.txt);;كل الملفات (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">ألغِ</translation>
+    </message>
 </context>
 <context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
         <source>Total articles:</source>
-        <translation type="unfinished">مجموع المقالات:</translation>
+        <translation>مجموع المقالات:</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="46"/>
         <source>Translates from:</source>
-        <translation type="unfinished">ترجم من:</translation>
+        <translation>ترجم من:</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="60"/>
         <source>Total words:</source>
-        <translation type="unfinished">مجموع الكلمات:</translation>
+        <translation>مجموع الكلمات:</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="77"/>
         <source>Translates to:</source>
-        <translation type="unfinished">ترجم إلى:</translation>
+        <translation>ترجم إلى:</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="91"/>
         <source>Open folder</source>
-        <translation type="unfinished"></translation>
+        <translation>افتح المجلد</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="110"/>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>حرّر القاموس</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="120"/>
         <source>Files comprising this dictionary:</source>
-        <translation type="unfinished">الملفات المشتملة على هذا القاموس:</translation>
+        <translation>الملفات التي تتضمن القاموس:</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="201"/>
         <source>Description:</source>
+        <translation>الوصف:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>حرّر القاموس بالأمر: %1</translation>
     </message>
 </context>
 <context>
@@ -554,44 +687,113 @@
     <message>
         <location filename="../groups_widgets.cc" line="233"/>
         <source>%1 entries</source>
-        <translation>%1 مدخل</translation>
+        <translation>%1 من المدخلات</translation>
     </message>
 </context>
 <context>
-    <name>DictionaryBar</name>
+    <name>DictServer</name>
     <message>
-        <source>Dictionary Bar</source>
-        <translation type="obsolete">شريط القاموس</translation>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">الاسم</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">العنوان</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictionaryBar</name>
+    <message>
         <location filename="../dictionarybar.cc" line="15"/>
         <source>&amp;Dictionary Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>شريط ال&amp;قواميس</translation>
     </message>
     <message>
         <location filename="../dictionarybar.cc" line="25"/>
         <source>Extended menu with all dictionaries...</source>
-        <translation type="unfinished"></translation>
+        <translation>قائمة موسّعة بكل القواميس...</translation>
     </message>
     <message>
         <location filename="../dictionarybar.cc" line="112"/>
         <source>Edit this group</source>
-        <translation type="unfinished">حرر هذه المجموعة</translation>
+        <translation>حرّر هذه المجموعة</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
+        <translation>معلومات القاموس</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
-        <translation type="unfinished"></translation>
+        <translation>افتح مجلد القاموس</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>حرّر القاموس</translation>
     </message>
 </context>
 <context>
@@ -602,41 +804,41 @@
         <translation>قواميس</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
-        <translation>&amp;مصادر</translation>
+        <translation>م&amp;صادر</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;قواميس</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>م&amp;جموعات</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
-        <translation>تغيرت المصادر</translation>
+        <translation>تغيّرت المصادر</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
-        <translation>بعض المصادر تغيرت. أتقبل التغييرات؟</translation>
+        <translation>بعض المصادر تغيّرت. أتقبل التّغييرات؟</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
-        <translation>أقبل</translation>
+        <translation>اقبل</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
-        <translation>ألغ</translation>
+        <translation>ألغِ</translation>
     </message>
 </context>
 <context>
@@ -644,6 +846,92 @@
     <message>
         <location filename="../externalviewer.cc" line="54"/>
         <source>the viewer program name is empty</source>
+        <translation>اسم برنامج العارض فارغ</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -652,37 +940,96 @@
     <message>
         <location filename="../forvo.cc" line="224"/>
         <source>XML parse error: %1 at %2,%3</source>
-        <translation type="unfinished">خطأ عبارة XML: %1 في %2,%3</translation>
+        <translation>خطأ تحليل XML: %1 عند %2،%3</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="300"/>
+        <source>Added %1</source>
+        <translation>أُضيف %1</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="303"/>
+        <source>by</source>
+        <translation>بواسطة</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="307"/>
+        <source>Male</source>
+        <translation>ذكر</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="307"/>
+        <source>Female</source>
+        <translation>أنثى</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="309"/>
+        <source>from</source>
+        <translation>من</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="347"/>
+        <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
+        <translation>اذهب إلى حرّر|قواميس|فورڤو واطلب منّا مفتاح API لإخفاء هذا الخطأ.</translation>
+    </message>
+</context>
+<context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forvo.cc" line="300"/>
-        <source>Added %1</source>
-        <translation type="unfinished">اُضيف %1</translation>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forvo.cc" line="303"/>
-        <source>by</source>
-        <translation type="unfinished">من</translation>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forvo.cc" line="307"/>
-        <source>Male</source>
-        <translation type="unfinished">ذكر</translation>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forvo.cc" line="307"/>
-        <source>Female</source>
-        <translation type="unfinished">انثى</translation>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../forvo.cc" line="309"/>
-        <source>from</source>
-        <translation type="unfinished">من</translation>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">ألغِ</translation>
     </message>
     <message>
-        <location filename="../forvo.cc" line="347"/>
-        <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
-        <translation type="unfinished">اذهب إلى تحرير|قواميس|مصادر|فروفو وطبّق لمفتحاح API الخاص بنا لإذهاب هذا الخطأ.</translation>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -690,7 +1037,7 @@
     <message>
         <location filename="../german.cc" line="48"/>
         <source>German Transliteration</source>
-        <translation>الترجمة الصوتية الألمانية</translation>
+        <translation>النسخ الألماني الحرفي</translation>
     </message>
 </context>
 <context>
@@ -698,7 +1045,7 @@
     <message>
         <location filename="../greektranslit.cc" line="839"/>
         <source>Greek Transliteration</source>
-        <translation type="unfinished">الترجمة الصوتية اليونانية</translation>
+        <translation>النسخ اليوناني الحرفي</translation>
     </message>
 </context>
 <context>
@@ -714,12 +1061,12 @@
     <message>
         <location filename="../groupselectorwidget.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished">صيغة</translation>
+        <translation>نموذج</translation>
     </message>
     <message>
         <location filename="../groupselectorwidget.ui" line="19"/>
         <source>Look in</source>
-        <translation>انظر في</translation>
+        <translation>ابحث في</translation>
     </message>
 </context>
 <context>
@@ -732,7 +1079,7 @@
     <message>
         <location filename="../groups.ui" line="64"/>
         <source>Add selected dictionaries to group (Ins)</source>
-        <translation>أضف القواميس المحددة للمجموعة (Ins)</translation>
+        <translation>أضف القواميس المحدّدة إلى المجموعة (Ins)</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="67"/>
@@ -747,7 +1094,7 @@
     <message>
         <location filename="../groups.ui" line="89"/>
         <source>Remove selected dictionaries from group (Del)</source>
-        <translation>أزل القواميس المحددة من المجموعة (Del)</translation>
+        <translation>أزل القواميس المحدّدة من المجموعة (Del)</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="92"/>
@@ -767,7 +1114,7 @@
     <message>
         <location filename="../groups.ui" line="133"/>
         <source>Tab 2</source>
-        <translation>Tab 2</translation>
+        <translation>لسان 2</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="143"/>
@@ -782,22 +1129,22 @@
     <message>
         <location filename="../groups.ui" line="153"/>
         <source>Create language-based groups</source>
-        <translation type="unfinished">أنشئ مجموعات بحسب اللغة</translation>
+        <translation>أنشئ مجموعات مبنية على اللغات</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="156"/>
         <source>Auto groups</source>
-        <translation type="unfinished">مجموعات تلقائية</translation>
+        <translation>مجموعات تلقائية</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="163"/>
         <source>Rename current dictionary group</source>
-        <translation>غير تسمية مجموعة القواميس الحالية</translation>
+        <translation>أعد تسمية مجموعة القواميس الحالية</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="166"/>
         <source>Re&amp;name group</source>
-        <translation>&amp;غير تسمية المجموعة</translation>
+        <translation>أ&amp;عد تسمية المجموعة</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="173"/>
@@ -816,49 +1163,107 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>أزل كل المجموعات</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="197"/>
         <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
-        <translation>اسحب و أ&amp;فلت القواميس إلى ومن المجموعات, انقلهم داخل المجموعات, أعد ترتيب المجموعة باستخدام الفأرة.</translation>
+        <translation>اسحب وأ&amp;فلت القواميس من وإلى المجموعات، انقلها داخل المجموعات، أعد ترتيب المجموعات باستخدام الفأرة.</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>أضف مجموعة</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
-        <translation>أعط المجموعة الجديدة اسما:</translation>
+        <translation>ضع اسمًا للمجموعة الجديدة:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
-        <translation>غير اسم المجموعة</translation>
+        <translation>أعد تسمية المجموعة</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
-        <translation>أعط المجموعة الجديدة اسما:</translation>
+        <translation>ضع اسمًا جديدًا للمجموعة:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>أزل المجموعة</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
-        <translation>أمتأكد من رغبتك بازالة المجموعة &lt;b&gt;%1&lt;/b&gt;؟</translation>
+        <translation>هل أنت متأكد من إزالة المجموعة &lt;b&gt;%1&lt;/b&gt;؟</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
-        <translation>أمتأكد من رغبتك بازالة كل المجموعات؟</translation>
+        <translation>هل أنت متأكد من إزالة كل المجموعات؟</translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">ارجع</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">تقدّم</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">قرّب</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">بعّد</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">الحجم الطّبيعي</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -866,51 +1271,51 @@
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
         <source>&amp;Delete Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>ا&amp;حذف المحدّد</translation>
     </message>
     <message>
         <location filename="../historypanewidget.cc" line="30"/>
         <source>Copy Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>انسخ المحدّد</translation>
     </message>
     <message>
         <location filename="../historypanewidget.cc" line="47"/>
         <source>History:</source>
-        <translation type="unfinished"></translation>
+        <translation>التأريخ:</translation>
     </message>
     <message>
         <location filename="../historypanewidget.cc" line="219"/>
         <source>%1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1/%2</translation>
     </message>
     <message>
         <location filename="../historypanewidget.cc" line="223"/>
         <source>History size: %1 entries out of maximum %2</source>
-        <translation type="unfinished"></translation>
+        <translation>حجم التأريخ: %1 من المدخلات من أصل %2</translation>
     </message>
 </context>
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
-        <translation>اقتراحات التهجئة:</translation>
+        <translation>اقتراحات الإملاء:</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
-        <translation type="unfinished">%1 صرف</translation>
+        <translation>الصَرْف %1</translation>
     </message>
 </context>
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
-        <translation>مفعل</translation>
+        <translation>مُمكّن</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>الاسم</translation>
     </message>
@@ -920,23 +1325,23 @@
     <message>
         <location filename="../initializing.ui" line="22"/>
         <source>GoldenDict - Initializing</source>
-        <translation>بدء - القاموس الذهبي</translation>
+        <translation>القاموس الذهبي - يهيّئ</translation>
     </message>
     <message>
         <location filename="../initializing.ui" line="28"/>
         <location filename="../initializing.cc" line="30"/>
         <source>Please wait while indexing dictionary</source>
-        <translation>انتظر بينما تفهرس القواميس</translation>
+        <translation>فضلًا انتظر بينما تُفهرَس القواميس</translation>
     </message>
     <message>
         <location filename="../initializing.ui" line="44"/>
         <source>Dictionary Name</source>
-        <translation>اسم القاموس</translation>
+        <translation>اسم القامويس</translation>
     </message>
     <message>
         <location filename="../initializing.cc" line="21"/>
         <source>Please wait...</source>
-        <translation>رجاء انتظر...</translation>
+        <translation>فضلًا انتظر...</translation>
     </message>
 </context>
 <context>
@@ -944,1013 +1349,1013 @@
     <message>
         <location filename="../language.cc" line="55"/>
         <source>Afar</source>
-        <translation type="unfinished"></translation>
+        <translation>العفرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="56"/>
         <source>Abkhazian</source>
-        <translation type="unfinished"></translation>
+        <translation>الأبخازية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="57"/>
         <source>Avestan</source>
-        <translation type="unfinished"></translation>
+        <translation>الأفستية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="58"/>
         <source>Afrikaans</source>
-        <translation type="unfinished"></translation>
+        <translation>الإفريقية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="59"/>
         <source>Akan</source>
-        <translation type="unfinished"></translation>
+        <translation>الأكانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="60"/>
         <source>Amharic</source>
-        <translation type="unfinished"></translation>
+        <translation>الأمهرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="61"/>
         <source>Aragonese</source>
-        <translation type="unfinished"></translation>
+        <translation>الأراغونية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="62"/>
         <source>Arabic</source>
-        <translation type="unfinished">عربي</translation>
+        <translation>العربية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="63"/>
         <source>Assamese</source>
-        <translation type="unfinished"></translation>
+        <translation>الأسامية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="64"/>
         <source>Avaric</source>
-        <translation type="unfinished"></translation>
+        <translation>الأفارية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="65"/>
         <source>Aymara</source>
-        <translation type="unfinished"></translation>
+        <translation>الأيمارية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="66"/>
         <source>Azerbaijani</source>
-        <translation type="unfinished"></translation>
+        <translation>الأذرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="67"/>
         <source>Bashkir</source>
-        <translation type="unfinished"></translation>
+        <translation>الباشكيرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="68"/>
         <source>Belarusian</source>
-        <translation type="unfinished"></translation>
+        <translation>البلاروسية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="69"/>
         <source>Bulgarian</source>
-        <translation type="unfinished"></translation>
+        <translation>البلغارية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="70"/>
         <source>Bihari</source>
-        <translation type="unfinished"></translation>
+        <translation>البيهارية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="71"/>
         <source>Bislama</source>
-        <translation type="unfinished"></translation>
+        <translation>البيسلامية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="72"/>
         <source>Bambara</source>
-        <translation type="unfinished"></translation>
+        <translation>البامبارية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="73"/>
         <source>Bengali</source>
-        <translation type="unfinished"></translation>
+        <translation>البنغالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="74"/>
         <source>Tibetan</source>
-        <translation type="unfinished"></translation>
+        <translation>التبتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="75"/>
         <source>Breton</source>
-        <translation type="unfinished"></translation>
+        <translation>البريتونية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="76"/>
         <source>Bosnian</source>
-        <translation type="unfinished"></translation>
+        <translation>البوسنية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="77"/>
         <source>Catalan</source>
-        <translation type="unfinished"></translation>
+        <translation>الكتالانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="78"/>
         <source>Chechen</source>
-        <translation type="unfinished"></translation>
+        <translation>الشيشانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="79"/>
         <source>Chamorro</source>
-        <translation type="unfinished"></translation>
+        <translation>التشامورو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="80"/>
         <source>Corsican</source>
-        <translation type="unfinished"></translation>
+        <translation>الكورسيكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="81"/>
         <source>Cree</source>
-        <translation type="unfinished"></translation>
+        <translation>الكري</translation>
     </message>
     <message>
         <location filename="../language.cc" line="82"/>
         <source>Czech</source>
-        <translation type="unfinished"></translation>
+        <translation>التشيكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="83"/>
         <source>Church Slavic</source>
-        <translation type="unfinished"></translation>
+        <translation>الكنيسة السلافية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="84"/>
         <source>Chuvash</source>
-        <translation type="unfinished"></translation>
+        <translation>التشوفاشية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="85"/>
         <source>Welsh</source>
-        <translation type="unfinished"></translation>
+        <translation>الويلزية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="86"/>
         <source>Danish</source>
-        <translation type="unfinished"></translation>
+        <translation>الدنماركية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="87"/>
         <source>German</source>
-        <translation type="unfinished"></translation>
+        <translation>الألمانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="88"/>
         <source>Divehi</source>
-        <translation type="unfinished"></translation>
+        <translation>الدِّيْفِيْهيّة</translation>
     </message>
     <message>
         <location filename="../language.cc" line="89"/>
         <source>Dzongkha</source>
-        <translation type="unfinished"></translation>
+        <translation>الزونخاية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="90"/>
         <source>Ewe</source>
-        <translation type="unfinished"></translation>
+        <translation>اليو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="91"/>
         <source>Greek</source>
-        <translation type="unfinished"></translation>
+        <translation>اليونانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="92"/>
         <source>English</source>
-        <translation type="unfinished">انكليزي</translation>
+        <translation>الإنجليزية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="93"/>
         <source>Esperanto</source>
-        <translation type="unfinished"></translation>
+        <translation>الاسبرانتو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="94"/>
         <source>Spanish</source>
-        <translation type="unfinished"></translation>
+        <translation>الإسبانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="95"/>
         <source>Estonian</source>
-        <translation type="unfinished"></translation>
+        <translation>الأستونية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="96"/>
         <source>Basque</source>
-        <translation type="unfinished"></translation>
+        <translation>الباسكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="97"/>
         <source>Persian</source>
-        <translation type="unfinished">فارسي</translation>
+        <translation>الفارسية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="98"/>
         <source>Fulah</source>
-        <translation type="unfinished"></translation>
+        <translation>الفولانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="99"/>
         <source>Finnish</source>
-        <translation type="unfinished"></translation>
+        <translation>الفنلندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="100"/>
         <source>Fijian</source>
-        <translation type="unfinished"></translation>
+        <translation>الفيجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="101"/>
         <source>Faroese</source>
-        <translation type="unfinished"></translation>
+        <translation>الفاروية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="102"/>
         <source>French</source>
-        <translation type="unfinished"></translation>
+        <translation>الفرنسية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="103"/>
         <source>Western Frisian</source>
-        <translation type="unfinished"></translation>
+        <translation>الفريزيان</translation>
     </message>
     <message>
         <location filename="../language.cc" line="104"/>
         <source>Irish</source>
-        <translation type="unfinished"></translation>
+        <translation>الأيرلندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="105"/>
         <source>Scottish Gaelic</source>
-        <translation type="unfinished"></translation>
+        <translation>الغيلية الأسكتلندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="106"/>
         <source>Galician</source>
-        <translation type="unfinished"></translation>
+        <translation>الجاليكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="107"/>
         <source>Guarani</source>
-        <translation type="unfinished"></translation>
+        <translation>الغوارانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="108"/>
         <source>Gujarati</source>
-        <translation type="unfinished"></translation>
+        <translation>الغوجاراتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="109"/>
         <source>Manx</source>
-        <translation type="unfinished"></translation>
+        <translation>المنكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="110"/>
         <source>Hausa</source>
-        <translation type="unfinished"></translation>
+        <translation>الهوساوية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="111"/>
         <source>Hebrew</source>
-        <translation type="unfinished"></translation>
+        <translation>العبرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="112"/>
         <source>Hindi</source>
-        <translation type="unfinished"></translation>
+        <translation>الهندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="113"/>
         <source>Hiri Motu</source>
-        <translation type="unfinished"></translation>
+        <translation>الحيري موتو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="114"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation>الكرواتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="115"/>
         <source>Haitian</source>
-        <translation type="unfinished"></translation>
+        <translation>الهايتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="116"/>
         <source>Hungarian</source>
-        <translation type="unfinished"></translation>
+        <translation>المجرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="117"/>
         <source>Armenian</source>
-        <translation type="unfinished"></translation>
+        <translation>الأرمينية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="118"/>
         <source>Herero</source>
-        <translation type="unfinished"></translation>
+        <translation>الهيريرو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="119"/>
         <source>Interlingua</source>
-        <translation type="unfinished"></translation>
+        <translation>الوسيطة</translation>
     </message>
     <message>
         <location filename="../language.cc" line="120"/>
         <source>Indonesian</source>
-        <translation type="unfinished"></translation>
+        <translation>الأندونيسية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="121"/>
         <source>Interlingue</source>
-        <translation type="unfinished"></translation>
+        <translation>الإنترلينجوا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="122"/>
         <source>Igbo</source>
-        <translation type="unfinished"></translation>
+        <translation>الإيبو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="123"/>
         <source>Sichuan Yi</source>
-        <translation type="unfinished"></translation>
+        <translation>سيتشوان يي</translation>
     </message>
     <message>
         <location filename="../language.cc" line="124"/>
         <source>Inupiaq</source>
-        <translation type="unfinished"></translation>
+        <translation>الاينبياك</translation>
     </message>
     <message>
         <location filename="../language.cc" line="125"/>
         <source>Ido</source>
-        <translation type="unfinished"></translation>
+        <translation>الآيدوية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="126"/>
         <source>Icelandic</source>
-        <translation type="unfinished"></translation>
+        <translation>الأيسلاندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="127"/>
         <source>Italian</source>
-        <translation type="unfinished"></translation>
+        <translation>الإيطالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="128"/>
         <source>Inuktitut</source>
-        <translation type="unfinished"></translation>
+        <translation>الإنكتيتوتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="129"/>
         <source>Japanese</source>
-        <translation type="unfinished"></translation>
+        <translation>اليابانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="130"/>
         <source>Javanese</source>
-        <translation type="unfinished"></translation>
+        <translation>الجاوية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="131"/>
         <source>Georgian</source>
-        <translation type="unfinished"></translation>
+        <translation>الجورجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="132"/>
         <source>Kongo</source>
-        <translation type="unfinished"></translation>
+        <translation>الكونغو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="133"/>
         <source>Kikuyu</source>
-        <translation type="unfinished"></translation>
+        <translation>الكيكويو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="134"/>
         <source>Kwanyama</source>
-        <translation type="unfinished"></translation>
+        <translation>الكوانيامية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="135"/>
         <source>Kazakh</source>
-        <translation type="unfinished"></translation>
+        <translation>الكازاخية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="136"/>
         <source>Kalaallisut</source>
-        <translation type="unfinished"></translation>
+        <translation>الجرينلاندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="137"/>
         <source>Khmer</source>
-        <translation type="unfinished"></translation>
+        <translation>الخميرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="138"/>
         <source>Kannada</source>
-        <translation type="unfinished"></translation>
+        <translation>الكانادية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="139"/>
         <source>Korean</source>
-        <translation type="unfinished"></translation>
+        <translation>الكورية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="140"/>
         <source>Kanuri</source>
-        <translation type="unfinished"></translation>
+        <translation>الكانورية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="141"/>
         <source>Kashmiri</source>
-        <translation type="unfinished"></translation>
+        <translation>الكشميرية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="142"/>
         <source>Kurdish</source>
-        <translation type="unfinished"></translation>
+        <translation>الكردية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="143"/>
         <source>Komi</source>
-        <translation type="unfinished"></translation>
+        <translation>الكومية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="144"/>
         <source>Cornish</source>
-        <translation type="unfinished"></translation>
+        <translation>الكورنية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="145"/>
         <source>Kirghiz</source>
-        <translation type="unfinished"></translation>
+        <translation>القيرقيزية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="146"/>
         <source>Latin</source>
-        <translation type="unfinished"></translation>
+        <translation>اللاتينية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="147"/>
         <source>Luxembourgish</source>
-        <translation type="unfinished"></translation>
+        <translation>اللوكسمبرجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="148"/>
         <source>Ganda</source>
-        <translation type="unfinished"></translation>
+        <translation>الغاندا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="149"/>
         <source>Limburgish</source>
-        <translation type="unfinished"></translation>
+        <translation>الليمبرجيشية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="150"/>
         <source>Lingala</source>
-        <translation type="unfinished"></translation>
+        <translation>اللينغالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="151"/>
         <source>Lao</source>
-        <translation type="unfinished"></translation>
+        <translation>اللاوية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="152"/>
         <source>Lithuanian</source>
-        <translation type="unfinished"></translation>
+        <translation>اللتوانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="153"/>
         <source>Luba-Katanga</source>
-        <translation type="unfinished"></translation>
+        <translation>لوبا-كاتانغا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="154"/>
         <source>Latvian</source>
-        <translation type="unfinished"></translation>
+        <translation>اللاتفية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="155"/>
         <source>Malagasy</source>
-        <translation type="unfinished"></translation>
+        <translation>المالاجاشية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="156"/>
         <source>Marshallese</source>
-        <translation type="unfinished"></translation>
+        <translation>المارشالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="157"/>
         <source>Maori</source>
-        <translation type="unfinished"></translation>
+        <translation>الماورية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="158"/>
         <source>Macedonian</source>
-        <translation type="unfinished"></translation>
+        <translation>المقدونية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="159"/>
         <source>Malayalam</source>
-        <translation type="unfinished"></translation>
+        <translation>المالايالامية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="160"/>
         <source>Mongolian</source>
-        <translation type="unfinished"></translation>
+        <translation>المنغولية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="161"/>
         <source>Marathi</source>
-        <translation type="unfinished"></translation>
+        <translation>المهاراتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="162"/>
         <source>Malay</source>
-        <translation type="unfinished"></translation>
+        <translation>المالاوية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="163"/>
         <source>Maltese</source>
-        <translation type="unfinished"></translation>
+        <translation>المالطية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="164"/>
         <source>Burmese</source>
-        <translation type="unfinished"></translation>
+        <translation>البورمية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="165"/>
         <source>Nauru</source>
-        <translation type="unfinished"></translation>
+        <translation>الناورو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="166"/>
         <source>Norwegian Bokmal</source>
-        <translation type="unfinished"></translation>
+        <translation>بوكمال النرويجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="167"/>
         <source>North Ndebele</source>
-        <translation type="unfinished"></translation>
+        <translation>شمال نديبيلي</translation>
     </message>
     <message>
         <location filename="../language.cc" line="168"/>
         <source>Nepali</source>
-        <translation type="unfinished"></translation>
+        <translation>النيبالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="169"/>
         <source>Ndonga</source>
-        <translation type="unfinished"></translation>
+        <translation>الإندونجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="170"/>
         <source>Dutch</source>
-        <translation type="unfinished"></translation>
+        <translation>الهولندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="171"/>
         <source>Norwegian Nynorsk</source>
-        <translation type="unfinished"></translation>
+        <translation>النينورسك النرويجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="172"/>
         <source>Norwegian</source>
-        <translation type="unfinished"></translation>
+        <translation>النرويجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="173"/>
         <source>South Ndebele</source>
-        <translation type="unfinished"></translation>
+        <translation>جنوب نديبيلي</translation>
     </message>
     <message>
         <location filename="../language.cc" line="174"/>
         <source>Navajo</source>
-        <translation type="unfinished"></translation>
+        <translation>النافاهو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="175"/>
         <source>Chichewa</source>
-        <translation type="unfinished"></translation>
+        <translation>الشيشيوا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="176"/>
         <source>Occitan</source>
-        <translation type="unfinished"></translation>
+        <translation>الأوكيتانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="177"/>
         <source>Ojibwa</source>
-        <translation type="unfinished"></translation>
+        <translation>الأوجيبوا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="178"/>
         <source>Oromo</source>
-        <translation type="unfinished"></translation>
+        <translation>الأورومية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="179"/>
         <source>Oriya</source>
-        <translation type="unfinished"></translation>
+        <translation>الأوريا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="180"/>
         <source>Ossetian</source>
-        <translation type="unfinished"></translation>
+        <translation>الأوسيتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="181"/>
         <source>Panjabi</source>
-        <translation type="unfinished"></translation>
+        <translation>البنجابية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="182"/>
         <source>Pali</source>
-        <translation type="unfinished"></translation>
+        <translation>البالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="183"/>
         <source>Polish</source>
-        <translation type="unfinished"></translation>
+        <translation>البولندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="184"/>
         <source>Pashto</source>
-        <translation type="unfinished"></translation>
+        <translation>البشتونية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="185"/>
         <source>Portuguese</source>
-        <translation type="unfinished"></translation>
+        <translation>البرتغالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="186"/>
         <source>Quechua</source>
-        <translation type="unfinished"></translation>
+        <translation>الكويتشوا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="187"/>
         <source>Raeto-Romance</source>
-        <translation type="unfinished"></translation>
+        <translation>ريتو-الرومانسية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="188"/>
         <source>Kirundi</source>
-        <translation type="unfinished"></translation>
+        <translation>الكيروندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="189"/>
         <source>Romanian</source>
-        <translation type="unfinished"></translation>
+        <translation>الرومانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="190"/>
         <source>Russian</source>
-        <translation type="unfinished"></translation>
+        <translation>الروسية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="191"/>
         <source>Kinyarwanda</source>
-        <translation type="unfinished"></translation>
+        <translation>الكينيارواندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="192"/>
         <source>Sanskrit</source>
-        <translation type="unfinished"></translation>
+        <translation>السنسكريتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="193"/>
         <source>Sardinian</source>
-        <translation type="unfinished"></translation>
+        <translation>السردينية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="194"/>
         <source>Sindhi</source>
-        <translation type="unfinished"></translation>
+        <translation>السندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="195"/>
         <source>Northern Sami</source>
-        <translation type="unfinished"></translation>
+        <translation>شمال سامي</translation>
     </message>
     <message>
         <location filename="../language.cc" line="196"/>
         <source>Sango</source>
-        <translation type="unfinished"></translation>
+        <translation>السانغو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="197"/>
         <source>Serbo-Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation>الصربية الكرواتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="198"/>
         <source>Sinhala</source>
-        <translation type="unfinished"></translation>
+        <translation>السنهالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="199"/>
         <source>Slovak</source>
-        <translation type="unfinished"></translation>
+        <translation>السلوفاكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="200"/>
         <source>Slovenian</source>
-        <translation type="unfinished"></translation>
+        <translation>السلوفينية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="201"/>
         <source>Samoan</source>
-        <translation type="unfinished"></translation>
+        <translation>الساموية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="202"/>
         <source>Shona</source>
-        <translation type="unfinished"></translation>
+        <translation>الشونا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="203"/>
         <source>Somali</source>
-        <translation type="unfinished"></translation>
+        <translation>الصومالية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="204"/>
         <source>Albanian</source>
-        <translation type="unfinished"></translation>
+        <translation>الألبانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="205"/>
         <source>Serbian</source>
-        <translation type="unfinished"></translation>
+        <translation>الصربية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="206"/>
         <source>Swati</source>
-        <translation type="unfinished"></translation>
+        <translation>السواتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="207"/>
         <source>Southern Sotho</source>
-        <translation type="unfinished"></translation>
+        <translation>جنوب السوتو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="208"/>
         <source>Sundanese</source>
-        <translation type="unfinished"></translation>
+        <translation>السوندانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="209"/>
         <source>Swedish</source>
-        <translation type="unfinished"></translation>
+        <translation>السويدية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="210"/>
         <source>Swahili</source>
-        <translation type="unfinished"></translation>
+        <translation>السواحلية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="211"/>
         <source>Tamil</source>
-        <translation type="unfinished"></translation>
+        <translation>التاميلية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="212"/>
         <source>Telugu</source>
-        <translation type="unfinished"></translation>
+        <translation>التيلجو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="213"/>
         <source>Tajik</source>
-        <translation type="unfinished"></translation>
+        <translation>الطاجيكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="214"/>
         <source>Thai</source>
-        <translation type="unfinished"></translation>
+        <translation>التايلاندية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="215"/>
         <source>Tigrinya</source>
-        <translation type="unfinished"></translation>
+        <translation>التغرينية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="216"/>
         <source>Turkmen</source>
-        <translation type="unfinished"></translation>
+        <translation>التركمانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="217"/>
         <source>Tagalog</source>
-        <translation type="unfinished"></translation>
+        <translation>التاجالوجية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="218"/>
         <source>Tswana</source>
-        <translation type="unfinished"></translation>
+        <translation>التسوانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="219"/>
         <source>Tonga</source>
-        <translation type="unfinished"></translation>
+        <translation>التونغا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="220"/>
         <source>Turkish</source>
-        <translation type="unfinished"></translation>
+        <translation>التركية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="221"/>
         <source>Tsonga</source>
-        <translation type="unfinished"></translation>
+        <translation>التسونجا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="222"/>
         <source>Tatar</source>
-        <translation type="unfinished"></translation>
+        <translation>التتارية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="223"/>
         <source>Twi</source>
-        <translation type="unfinished"></translation>
+        <translation>التوي</translation>
     </message>
     <message>
         <location filename="../language.cc" line="224"/>
         <source>Tahitian</source>
-        <translation type="unfinished"></translation>
+        <translation>التاهيتية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="225"/>
         <source>Uighur</source>
-        <translation type="unfinished">ايغور</translation>
+        <translation>الإيغورية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="226"/>
         <source>Ukrainian</source>
-        <translation type="unfinished"></translation>
+        <translation>الأوكرانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="227"/>
         <source>Urdu</source>
-        <translation type="unfinished">اوردو</translation>
+        <translation>الأُردية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="228"/>
         <source>Uzbek</source>
-        <translation type="unfinished"></translation>
+        <translation>الأوزبكية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="229"/>
         <source>Venda</source>
-        <translation type="unfinished"></translation>
+        <translation>الفيندا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="230"/>
         <source>Vietnamese</source>
-        <translation type="unfinished"></translation>
+        <translation>الفيتنامية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="231"/>
         <source>Volapuk</source>
-        <translation type="unfinished"></translation>
+        <translation>فولابوك</translation>
     </message>
     <message>
         <location filename="../language.cc" line="232"/>
         <source>Walloon</source>
-        <translation type="unfinished"></translation>
+        <translation>الولونية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="233"/>
         <source>Wolof</source>
-        <translation type="unfinished"></translation>
+        <translation>الوولوف</translation>
     </message>
     <message>
         <location filename="../language.cc" line="234"/>
         <source>Xhosa</source>
-        <translation type="unfinished"></translation>
+        <translation>زوسا</translation>
     </message>
     <message>
         <location filename="../language.cc" line="235"/>
         <source>Yiddish</source>
-        <translation type="unfinished"></translation>
+        <translation>اليديشية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="236"/>
         <source>Yoruba</source>
-        <translation type="unfinished"></translation>
+        <translation>اليوروبية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="237"/>
         <source>Zhuang</source>
-        <translation type="unfinished"></translation>
+        <translation>التشوانغية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="238"/>
         <source>Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>الصينية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="239"/>
         <source>Zulu</source>
-        <translation type="unfinished"></translation>
+        <translation>الزولو</translation>
     </message>
     <message>
         <location filename="../language.cc" line="240"/>
         <source>Lojban</source>
-        <translation type="unfinished"></translation>
+        <translation>اللوجبانية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="375"/>
         <source>Traditional Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>الصينية التقليدية</translation>
     </message>
     <message>
         <location filename="../language.cc" line="376"/>
         <source>Simplified Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>الصينية المبسطة</translation>
     </message>
     <message>
         <location filename="../language.cc" line="377"/>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>أخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="378"/>
         <source>Other Simplified Chinese dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>لهجات الصينية المبسطة الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="379"/>
         <source>Other Traditional Chinese dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>لهجات الصينية التقليدية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="380"/>
         <source>Other Eastern-European languages</source>
-        <translation type="unfinished"></translation>
+        <translation>لغات شرق أوروبا الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="381"/>
         <source>Other Western-European languages</source>
-        <translation type="unfinished"></translation>
+        <translation>لغات غرب أوروبا الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="382"/>
         <source>Other Russian languages</source>
-        <translation type="unfinished"></translation>
+        <translation>اللغات الروسية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="383"/>
         <source>Other Japanese languages</source>
-        <translation type="unfinished"></translation>
+        <translation>اللغات اليابانية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="384"/>
         <source>Other Baltic languages</source>
-        <translation type="unfinished"></translation>
+        <translation>اللغات البلطيقية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="385"/>
         <source>Other Greek languages</source>
-        <translation type="unfinished"></translation>
+        <translation>اللغات اليونانية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="386"/>
         <source>Other Korean dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>اللهجات الكورية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="387"/>
         <source>Other Turkish dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>اللهجات التركية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="388"/>
         <source>Other Thai dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>اللهجات التايلاندية الأخرى</translation>
     </message>
     <message>
         <location filename="../language.cc" line="389"/>
         <source>Tamazight</source>
-        <translation type="unfinished"></translation>
+        <translation>الأمازيغية</translation>
     </message>
 </context>
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>خطأ في تحميل القواميس</translation>
     </message>
@@ -1958,633 +2363,638 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ في ملف الإعداد. أأتابع بالإعدادات الافتراضية؟</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <source>GoldenDict</source>
-        <translation type="obsolete">القاموس الذهبي</translation>
-    </message>
-    <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
-        <translation>مرحبا!</translation>
+        <translation>مرحبًا بك!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;ملف</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
-        <translation>&amp;حرر</translation>
+        <translation>&amp;حرّر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
-        <translation>&amp;مساعدة</translation>
+        <translation>م&amp;ساعدة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;عرض</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
-        <translation type="unfinished">&amp;كبّر</translation>
+        <translation>ت&amp;قريب</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
-        <translation>&amp;تاريخ</translation>
+        <translation>&amp;تأريخ</translation>
     </message>
     <message>
-        <source>Search Pane</source>
-        <translation type="obsolete">شريط البحث</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="319"/>
-        <source>&amp;Dictionaries...</source>
-        <translation>&amp;قواميس...</translation>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
-        <source>F3</source>
-        <translation type="unfinished">F3</translation>
+        <location filename="../mainwindow.ui" line="150"/>
+        <source>&amp;Search Pane</source>
+        <translation>لوحة ال&amp;بحث</translation>
     </message>
     <message>
-        <source>&amp;Groups...</source>
-        <translation type="obsolete">م&amp;جموعات...</translation>
+        <location filename="../mainwindow.ui" line="277"/>
+        <source>&amp;Results Navigation Pane</source>
+        <translation>لوحة التنقّل بين النتائ&amp;ج</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
-        <source>&amp;Search Pane</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="304"/>
+        <source>&amp;History Pane</source>
+        <translation>لوحة التأري&amp;خ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
-        <source>&amp;Results Navigation Pane</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="338"/>
+        <source>&amp;Dictionaries...</source>
+        <translation>&amp;قواميس...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
-        <source>&amp;History Pane</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="341"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>ت&amp;فضيلات...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;صفحة البداية</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
-        <translation>ح&amp;ول</translation>
+        <translation>&amp;حول</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>حول القاموس الذهبي</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>ا&amp;خرج</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
-        <translation>اخرج من البرنامج</translation>
+        <translation>اخرج من التطبيق</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
-        <translation>Ctrl+خ</translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
-        <translation>&amp;منتدى</translation>
+        <translation>المن&amp;تدى</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
-        <translation>ا&amp;نزل لزاوية النظام</translation>
+        <translation>أ&amp;غلق إلى صينية النظام</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
-        <translation>تصغير النافذة إلى الزاوية</translation>
+        <translation>يصغّر النافذة إلى صينية النظام</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
-        <translation>ا&amp;حفظ المقال</translation>
+        <translation>ا&amp;حفظ المقالة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
-        <translation>حفظ المقال</translation>
+        <translation>احفظ المقالة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>ا&amp;طبع</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
-        <translation>Ctrl+ط</translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
-        <translation>ا&amp;عداد الصفحة</translation>
+        <translation>إ&amp;عداد الصفحة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
-        <translation type="unfinished"></translation>
+        <translation>معاي&amp;نة الطباعة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
-        <translation type="unfinished"></translation>
+        <translation>أعد إ&amp;كتشاف الملفات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
-        <source>&amp;New Tab</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="471"/>
+        <source>Ctrl+F5</source>
+        <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
-        <source>&amp;Always on Top</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="479"/>
+        <source>&amp;Clear</source>
+        <translation>ا&amp;محُ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
-        <source>Always on Top</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="491"/>
+        <source>&amp;New Tab</source>
+        <translation>لسان &amp;جديد</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
-        <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="494"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
-        <source>Menu Button</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="505"/>
+        <source>&amp;Configuration Folder</source>
+        <translation>مجلد الإ&amp;عداد</translation>
     </message>
     <message>
-        <source>Print Preview</source>
-        <translation type="obsolete">معاينة الطباعة</translation>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
+        <source>&amp;Show</source>
+        <translation>أ&amp;ظهر</translation>
     </message>
     <message>
-        <source>Rescan Files</source>
-        <translation type="obsolete">اعد فحص الملفات</translation>
+        <location filename="../mainwindow.ui" line="516"/>
+        <source>Ctrl+H</source>
+        <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
-        <source>Ctrl+F5</source>
-        <translation>Ctrl+F5</translation>
+        <location filename="../mainwindow.ui" line="524"/>
+        <source>&amp;Export</source>
+        <translation>&amp;صدّر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
-        <source>&amp;Clear</source>
-        <translation>&amp;مسح</translation>
+        <location filename="../mainwindow.ui" line="532"/>
+        <source>&amp;Import</source>
+        <translation>ا&amp;ستورد</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
-        <source>New Tab</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="543"/>
+        <source>&amp;Always on Top</source>
+        <translation>&amp;دائمًا في الأعلى</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
-        <source>Ctrl+T</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="546"/>
+        <source>Always on Top</source>
+        <translation>دائمًا في الأعلى</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
-        <source>&amp;Configuration Folder</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="549"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
+        <source>Menu Button</source>
+        <translation>زر قائمة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
-        <source>Ctrl+H</source>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
-        <source>&amp;Export</source>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
-        <source>&amp;Import</source>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Names in Dictionary Bar</source>
-        <translation type="obsolete">اعرض الاسماء في شريط القواميس</translation>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
-        <source>&amp;Menubar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cc" line="94"/>
+        <source>Show Names in Dictionary &amp;Bar</source>
+        <translation>أظهر الأسماء في &amp;شريط القواميس</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
-        <source>Look up in:</source>
-        <translation>انظر في:</translation>
+        <location filename="../mainwindow.cc" line="95"/>
+        <source>Show Small Icons in &amp;Toolbars</source>
+        <translation>أظهر رموز صغيرة في شريط الأد&amp;وات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
-        <source>Found in Dictionaries:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cc" line="96"/>
+        <source>&amp;Menubar</source>
+        <translation>شريط ال&amp;قوائم</translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation type="obsolete">التنقل</translation>
+        <location filename="../mainwindow.cc" line="151"/>
+        <source>&amp;Navigation</source>
+        <translation>التن&amp;قّل</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>ارجع</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
-        <translation>تقدم</translation>
+        <translation>تقدّم</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
-        <translation>انبثاق النتائج</translation>
+        <translation>منبثقة الاستكشاف</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>انطق الكلمة (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
-        <translation>تكبير</translation>
+        <translation>قرّب</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
-        <translation>تصغير</translation>
+        <translation>بعّد</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
-        <translation>حجم طبيعي</translation>
+        <translation>الحجم الطّبيعي</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
+        <source>Look up in:</source>
+        <translation>ابحث في:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="299"/>
+        <source>Found in Dictionaries:</source>
+        <translation>اعثر في القواميس:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
-        <translation type="unfinished">تكبير الكلمات</translation>
+        <translation>قرّب الكلمات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
-        <translation type="unfinished">تصغير الكلمات</translation>
+        <translation>يعّد الكلمات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
-        <translation type="unfinished">الحجم الطبيعي للكلمات</translation>
+        <translation>حجم الكلمات العادي</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
-        <translation>اعرض النافذة ال&amp;رئيسية</translation>
+        <translation>أظهر النافذة ال&amp;رئيسية</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="370"/>
+        <source>Opened tabs</source>
+        <translation>الألسنة المفتوحة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
-        <translation type="unfinished">أغلق اللسان الحالي</translation>
+        <translation>أغلق اللسان الحالي</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
-        <translation type="unfinished">أغلق كل الألسنة</translation>
+        <translation>أغلق كل الألسنة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
-        <translation type="unfinished">أغلق كل الألسنة عدا الحالي</translation>
+        <translation>أغلق كل الألسنة ما عدا هذا</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
-        <translation>تحميل...</translation>
+        <translation>يحمّل...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
-        <source>%1 dictionaries, %2 articles, %3 words</source>
-        <translation>%1 قواميس, %2 مقالات, %3 كلمات</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cc" line="1116"/>
-        <source>Look up:</source>
-        <translation>انظر:</translation>
+        <location filename="../mainwindow.cc" line="558"/>
+        <source>New Tab</source>
+        <translation>لسان جديد</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
-        <source>All</source>
-        <translation>الكل</translation>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
+        <source>Accessibility API is not enabled</source>
+        <translation>أداة الإتاحة غير ممكّنة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
-        <source>Opened tabs</source>
-        <translation type="unfinished">الألسنة المفتوحة</translation>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
-        <source>Show Names in Dictionary &amp;Bar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cc" line="1213"/>
+        <source>%1 dictionaries, %2 articles, %3 words</source>
+        <translation>%1 من القواميس، %2 من المقالات، %3 من الكلمات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
-        <source>Show Small Icons in &amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cc" line="1224"/>
+        <source>Look up:</source>
+        <translation>ابحث عن:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
-        <source>&amp;Navigation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cc" line="1242"/>
+        <source>All</source>
+        <translation>الكل</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
-        <translation type="unfinished"></translation>
+        <translation>قائمة الألسنة المفتوحة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
-        <translation>(بلا عنوان)</translation>
+        <translation>(غير معنون)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WARNING: %1</source>
-        <translation type="obsolete">تحذير: %1</translation>
+        <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
-        <translation>فشل بدء آلية مراقبة المفاتيح السريعة.&lt;br&gt;تأكد من ان خادم الرسوميات مفعّل للاحقة RECORD.</translation>
+        <translation>فشل تهيئة تقنية مراقبة المفاتيح الساخنة.&lt;br&gt;تأكد من أن امتداد RECORD في XServer ممكّن.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
-        <translation>اصدار جديد متوفر</translation>
+        <translation>إصدار جديد متوفّر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
-        <translation>الاصدار &lt;b&gt;%1&lt;/b&gt; من القاموس الذهبي متوفر للتنزيل.&lt;br&gt;انقر &lt;b&gt;نزّل&lt;/b&gt; للوصول لصفحة التنزيل.</translation>
+        <translation>الإصدار &lt;b&gt;%1&lt;/b&gt; من القاموس الذهبي متوفّر الآن للتنزيل.&lt;br&gt;انقر &lt;b&gt;نزّل&lt;/b&gt; للوصول إلى صفحة التنزيل.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>نزّل</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
-        <translation>تجاهل هذا الاصدار</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
-        <source>Accessibility API is not enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>تخطّ هذا الإصدار</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
-        <translation type="unfinished"></translation>
+        <translation>اخترت إخفاء شريط القوائم. استخدم %1 لإظهاره مرة أخرى.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
-        <translation>اعداد الصفحة</translation>
+        <translation>إعداد الصفحة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
-        <translation>لا يوجد طابعة. ركب واحدة أولا.</translation>
+        <translation>لا تتوفر طابعة. فضلًا ثبّت واحدة أولًا.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
-        <translation>اطبع المقال</translation>
+        <translation>اطبع المقالة</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>مقالة، بالكامل (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>مقالة، HTML فقط (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
-        <translation>احفظ المقال كـ</translation>
-    </message>
-    <message>
-        <source>Html files (*.html *.htm)</source>
-        <translation type="obsolete">ملفات Html ‏(*.html *.htm)</translation>
+        <translation>احفظ المقالة كـ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>خطأ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
-        <translation>تعذر حفظ المقال: %1</translation>
+        <translation>تعذّر حفظ المقالة: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
-        <translation type="unfinished"></translation>
+        <translation>يحفظ المقالة...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
-        <translation type="unfinished"></translation>
+        <translation>عُيّنت النافذة الرئيسية في الأعلى دائمًا.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>أ&amp;خفِ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
-        <translation type="unfinished"></translation>
+        <translation>صدّر التأريخ إلى ملف</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>ملفات نص (*.txt);;كل الملفات (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
-        <translation type="unfinished"></translation>
+        <translation>اكتمل تصدير التأريخ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ استيراد:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
-        <translation type="unfinished"></translation>
+        <translation>استورد التأريخ من ملف</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ استيراد: بيانات غير صالحة في الملف</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
-        <translation type="unfinished"></translation>
+        <translation>اكتمل استيراد التأريخ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ استيراد:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
+        <translation>معلومات القاموس</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
-        <translation type="unfinished"></translation>
+        <translation>افتح مجلد القاموس</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>حرّر القاموس</translation>
     </message>
 </context>
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>عُبث في ملف القاموس أو أُتلف</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل تحميل المقالة من %1، السبب: %2</translation>
     </message>
 </context>
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
-        <translation>خطأ عبارة XML: %1 في %2,%3</translation>
+        <translation>خطأ تحليل XML: %1 عند %2،%3</translation>
     </message>
 </context>
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
-        <translation>خطأ عبارة XML: %1 في %2,%3</translation>
+        <translation>خطأ تحليل XML: %1 عند %2،%3</translation>
     </message>
 </context>
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
-        <translation>مفعل</translation>
+        <translation>ممكّن</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>الاسم</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>العنوان</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>الرّمز</translation>
     </message>
 </context>
 <context>
@@ -2592,93 +3002,99 @@
     <message>
         <location filename="../orderandprops.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">صيغة</translation>
+        <translation>النموذج</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
-        <source>Dictionary order:</source>
-        <translation>ترتيب القواميس:</translation>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../orderandprops.ui" line="37"/>
+        <source>Dictionary order:</source>
+        <translation>ترتيب القواميس:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
-        <translation>القواميس غير العاملة (معطلة):</translation>
+        <translation>القواميس غير النشطة (المعطّلة):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
-        <translation>معلومات  القاموس</translation>
+        <translation>معلومات القاموس</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>الاسم:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>مجموع المقالات:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>مجموع الكلمات:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
-        <translation>ترجم من:</translation>
+        <translation>الترجمات من:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
-        <translation>ترجم إلى:</translation>
+        <translation>الترجمات إلى:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>الوصف:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
-        <translation>الملفات المشتملة على هذا القاموس:</translation>
+        <translation>الملفات التي تتضمن القاموس:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
-        <translation>غير الترتيب بسحب وافلات العناصر. اسحب القواميس إلى المجموعة غير الفعالة لتعطيل استخدامها.</translation>
+        <translation>اضبط الترتيب بسحب العناصر إفلاتها في القائمة. أفلت القواميس في المجموعة غير النشطة لتعطيل استخدامها.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
-        <translation type="unfinished"></translation>
+        <translation>افرز بالاسم</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
+        <translation>افرز باللغة</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>المسار</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
-        <translation>تداخل</translation>
+        <translation>التكرارية</translation>
     </message>
 </context>
 <context>
@@ -2686,110 +3102,143 @@
     <message>
         <location filename="../preferences.ui" line="14"/>
         <source>Preferences</source>
-        <translation>التفضيلات</translation>
+        <translation>تفضيلات</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="47"/>
         <source>&amp;Interface</source>
-        <translation>الوا&amp;جهة</translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="187"/>
-        <source>Tabbed browsing</source>
-        <translation>التصفح بالألسنة</translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="193"/>
-        <source>Normally, opening a new tab switches to it immediately.
-With this on however, new tabs will be opened without
-switching to them.</source>
-        <translation>الأصل، فتح لسان جديد ينتقل له تلقائيا.
-عند تشغيل هذه, الألسنة الجديدة ستفتح
-دون الانتقال لها.</translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="198"/>
-        <source>Open new tabs in background</source>
-        <translation>افتح الألسنة الجديدة في الخلفية</translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="205"/>
-        <source>With this on, new tabs are opened just after the
-current, active one. Otherwise they are added to
-be the last ones.</source>
-        <translation>عند تشغيل هذه, الألسنة الجديدة تفتح
-مباشرة بعد, اللسان النشط. دونها
-تضاف بعد آخر لسان.</translation>
+        <translation>ال&amp;واجهة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="210"/>
-        <source>Open new tabs after the current one</source>
-        <translation>افتح الألسنة الجديدة بعد اللسان الحالي</translation>
+        <location filename="../preferences.ui" line="53"/>
+        <source>Startup</source>
+        <translation>البدء</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="217"/>
-        <source>Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../preferences.ui" line="59"/>
+        <source>Automatically starts GoldenDict after operation system bootup.</source>
+        <translation>يبدأ القاموس الذهبي مباشرة بعد إقلاع النّظام .</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="220"/>
-        <source>Hide single tab</source>
-        <translation type="unfinished"></translation>
+        <location filename="../preferences.ui" line="62"/>
+        <source>Start with system</source>
+        <translation>ابدأ مع النظام</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="227"/>
-        <source>Ctrl-Tab navigates tabs in MRU order</source>
-        <translation type="unfinished"></translation>
+        <location filename="../preferences.ui" line="74"/>
+        <source>Add-on style:</source>
+        <translation>نمط الملحقة:</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="99"/>
         <source>When enabled, an icon appears in the sytem tray area which can be used
 to open main window and perform other tasks.</source>
-        <translation>عند تفعيلها, ستظهر أيقونة في زاوية النظام يمكن استخدامها
-لفتح النافذة الرئيسية و تأدية مهام أخرى.</translation>
+        <translation>عند تمكينه، سيظهر رمز في صينية النظام حيث يمكن استخدامها
+لفتح النافذة الرئيسية وإجراء مهامَ أخرى.</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="103"/>
         <source>Enable system tray icon</source>
-        <translation>فعل أيقونة زاوية النظام</translation>
+        <translation>مكّن رمز صينية النظام</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="121"/>
         <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
-        <translation>بتشغيل هذه, البرنامج سينتقل البرنامج مباشرة إلى زاوية النظام دون عرض
-النافذة الرئيسية.</translation>
+        <translation>بهذه، يبدأ التطبيق تلقائيًّا في صينية النظام دون
+أن تظهر النافذة الرئيسية.</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="125"/>
         <source>Start to system tray</source>
-        <translation>ابدأ في زاوية النظام</translation>
+        <translation>ابدأ إلى صينية النظام</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="132"/>
         <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
-        <translation>بتشغيل هذه, اغلاق النافذة الرئيسية سيخفيها بدلا من إغلاق البرنامج.</translation>
+        <translation>بهذه، محاولة إغلاق النافذة الرئيسية يخفي التطبيق بدلًا
+من إنهائه.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="136"/>
+        <source>Close to system tray</source>
+        <translation>أغلق إلى صينية النظام</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="146"/>
+        <source>Double-click translates the word clicked</source>
+        <translation>النقر المزدوج يترجم الكلمة المحدّدة</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="153"/>
+        <source>Normally, pressing ESC key moves focus to the translation line.
+With this on however, it will hide the main window.</source>
+        <translation>عادةً، ضغط ESC ينقل التركيز إلى سطر الترجمة.
+بهذه، على أي حال، ستُخفي النافذة الرئيسية.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="157"/>
+        <source>ESC key hides main window</source>
+        <translation>مفتاح ESC يخفي النافذة الرئيسية</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="164"/>
+        <source>Turn this option on if you want to select words by single mouse click</source>
+        <translation>مكّن هذا الخيار إن أردت تحديد الكلمة بنقرة فأرة واحدة</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="167"/>
+        <source>Select word by single click</source>
+        <translation>حدّد الكلمة بنقرة مفردة</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="187"/>
+        <source>Tabbed browsing</source>
+        <translation>التصفّح المبوّب</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="193"/>
+        <source>Normally, opening a new tab switches to it immediately.
+With this on however, new tabs will be opened without
+switching to them.</source>
+        <translation>عادةً، عند فتح لسان، يُتبدَّل إليه تلقائيًّا.
+بهذه، على أي حال، الألسنة الجديدة ستُفتح دون
+التبديل إليها.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="198"/>
+        <source>Open new tabs in background</source>
+        <translation>افتح الألسنة الجديدة في الخلفية</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="205"/>
+        <source>With this on, new tabs are opened just after the
+current, active one. Otherwise they are added to
+be the last ones.</source>
+        <translation>بهذه، الألسنة ستُفتح فقط بعد
+الحاليّة، النشطة. وإلّا ستُضاف
+إلى الألسنة الأخيرة.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="136"/>
-        <source>Close to system tray</source>
-        <translation>اغلق إلى زاوية النظام</translation>
+        <location filename="../preferences.ui" line="210"/>
+        <source>Open new tabs after the current one</source>
+        <translation>افتح الألسنة الجديدة بعد الحاليّة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="53"/>
-        <source>Startup</source>
-        <translation>تشغيل تلقائي</translation>
+        <location filename="../preferences.ui" line="217"/>
+        <source>Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</source>
+        <translation>اختر هذا الخيار إن لم تكن تريد رؤية شريط الألسنة الرئيسي عندما يكون لسان واحد مفتوح.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="59"/>
-        <source>Automatically starts GoldenDict after operation system bootup.</source>
-        <translation>ابدأ القاموس الذهبي مباشرة بعد اقلاع النظام.</translation>
+        <location filename="../preferences.ui" line="220"/>
+        <source>Hide single tab</source>
+        <translation>أخفِ لسانًا واحدًا</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="62"/>
-        <source>Start with system</source>
-        <translation>ابدأ مع النظام</translation>
+        <location filename="../preferences.ui" line="227"/>
+        <source>Ctrl-Tab navigates tabs in MRU order</source>
+        <translation>Ctrl-Tab يتنقّل بين الألسنة بترتيب MRU</translation>
     </message>
     <message>
         <location filename="../preferences.ui" line="239"/>
@@ -2802,250 +3251,228 @@
         <translation>نمط العرض:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="146"/>
-        <source>Double-click translates the word clicked</source>
-        <translation type="unfinished">النقر المزدوج يترجم الكلمة المنقورة</translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="153"/>
-        <source>Normally, pressing ESC key moves focus to the translation line.
-With this on however, it will hide the main window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="157"/>
-        <source>ESC key hides main window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="164"/>
-        <source>Turn this option on if you want to select words by single mouse click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="167"/>
-        <source>Select word by single click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="74"/>
-        <source>Add-on style:</source>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
-        <translation type="unfinished"></translation>
+        <translation>اضبط هذه القيمة لتجنّب قوائم المحتوى الضخمة.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
-        <translation type="unfinished"></translation>
+        <translation>حد القواميس في قائمة السياق:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
-        <translation>م&amp;نبثقة البحث</translation>
+        <translation>منبثقة الا&amp;ستكشاف</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
 off from main window or tray icon.</source>
-        <translation>عند تفعيلها, نافذة منبثقة بالترجمة ستظهر كل مرة تضع مؤشر الفأرة على
-أية كلمة على الشاشة (وندز) أو حدد أية كلمة بالفأرة (لينكس). عند التفعيل
-يمكنك تشغيلها و اطفائها من النافذة الرئيسية أو زاوية النظام.</translation>
+        <translation>إن مكّن، نافذة ترجمة منبثقة ستظهر كل مرة
+تضع المؤشر على أي كلمة على الشاشة (ويندوز)
+أو تحدّد أي كلمة بالفأرة (لينكس). إن مكّن، تستطيع
+تشغيله أو تعطيله من النافذة الرئيسية أو صينية النظام.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
-        <translation>مكّن خاصية منبثقة البحث</translation>
+        <translation>مكّن وظيفة منبثقة الاستكشاف</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
-        <translation>اختر إذا ماكانت منبثقة البحث مشغلة افتراضيا أم لا. إن حددت, البرنامج سيبدأ
-دائما مع خاصية المنبثقة منشطة.</translation>
+        <translation>يحدّد إن كان وضع منبثقة الاستكشاف ممكّن افتراضيًّا أو لا. إن عُلِّم،
+سيبدأ البرنامج دائمًا ومنبثقة الاستكشاف نشطة.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
-        <translation>ابدأ مع منبثقة البحث تعمل</translation>
+        <translation>ابدأ و منبثقة الاستكشاف تعمل</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
-        <translation type="unfinished">عند تمكين هذا, المنبثقة ستظهر فقط عند استمرار ضغط كل المفاتيح المختارة
-عند تغيّر تحديد الكلمة.</translation>
+        <translation>إن كان هذا ممكّنًا، النافذة المنبثقة ستظهر فقط إن كانت كل
+المفاتيح مضغوطة عندما يتغيّر تحديد الكلمة.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
-        <translation type="unfinished">اظهر المنبثقة عند كون كل المفاتيح المحددة مضغوطة فقط:</translation>
+        <translation>أظهر المنبثقة فقط عند إبقاء الضغط على المفاتيح هذه كلها:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Ctrl اليساري فقط</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl اليساري</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
-        <translation>Shift اليسار فقط</translation>
+        <translation>Shift اليميني فقط</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
-        <translation>Shift اليمين</translation>
+        <translation>Shift اليميني</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>مفتاح Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>مفتاح Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
-        <translation>Alt اليسار فقط</translation>
+        <translation>Alt اليساري فقط</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
-        <translation>Alt اليسار</translation>
+        <translation>Alt اليساري</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>مفتاح Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
-        <translation>Alt اليمين فقط</translation>
+        <translation>Alt اليميني فقط</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
-        <translation>Alt اليمين</translation>
+        <translation>Alt اليميني</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
-        <translation>Ctrl اليمين فقط</translation>
+        <translation>Ctrl اليميني فقط</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
-        <translation>Ctrl اليمين</translation>
+        <translation>Ctrl اليميني</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
-        <translation>Shift اليسار فقط</translation>
+        <translation>Shift اليساري فقط</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
-        <translation>Shift اليسار</translation>
+        <translation>Shift اليساري</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
-        <translation>مفتاح وندز أو مفتاح ميتا</translation>
+        <translation>مفتاح الشّعار</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
-        <translation>Win/Meta</translation>
+        <translation>ويندوز/ميتا</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
 be pressed shortly after the selection is done.</source>
-        <translation>الأصل, لتفعيل المنبثقة عليك ابقاء المفاتيح المختارة
-مضغوطة عند اختيارك لكلمة. عند تمكين هذا, المفاتيح
-يمكن ان تضغط أيضا بعد تحديد الكلمة.</translation>
+        <translation>عادةً، لتفعيل المنبثقة عليك إبقاء
+الضغط على المفاتيح المختارة وأنت
+تحدّد الكلمة. عند تمكين هذا، المفاتيح
+المختارة يمكن ضغطها بوقت أقل بعد
+الانتهاء من التحديد.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
-        <translation>يمكن ان تضغط المفاتيح لاحقا, في</translation>
+        <translation>يمكن أيضًا ضغط المفاتيح فيما بعد خلال</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
-        <translation>لتجنب اللبس, ستراقب المفاتيح بعد انتهاء التحديد لفترة
-محددة من الثوان, المحددة هنا.</translation>
+        <translation>لتجنّب الأخطاء، تُراقب المفاتيح أيضًا
+بعد الاختيار القيمة لوقت محدّد من
+الثواني، والذي تستطيع تحديده هنا.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
-        <translation>ثانية</translation>
+        <translation>ث</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
-        <translation type="unfinished"></translation>
+        <translation>أرسل الكلمة المترجمة إلى النافذة الرئيسية بدلًا من إظهارها في نافذة منبثقة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
-        <translation type="unfinished"></translation>
+        <translation>أرسل الكلمة المترجمة إلى النافذة الرئيسية</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>المفاتيح السريعة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
-        <translation>استخدم هذه المفاتيح السريعة لعرض أو اخفاء النافذة الرئيسية:</translation>
+        <translation>استخدم المفتاح السّريع التالي لإظهار أو إخفاء النافذة الرئيسية:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
-        <translation>استخدم هذه المفاتيح السريعة لترجمة كلمة من الحافظة:</translation>
+        <translation>استخدم المفاتيح السّريع التالي لترجمة كلمة من الحافظة:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
-        <translation>المفاتيح السريعة عامة و تعمل من أي برنامج أو اي سياق طالما ان القاموس الذهبي يعمل في الخلفية.</translation>
+        <translation>المفاتيح السريعة تعمل في أي مكان من الحاسوب خلال أي محتوى طالما القاموس الذهبي يعمل في الخلفية.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3055,367 +3482,390 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;ملاحظة: يبدو انك تعمل على اصدار من خادوم X.Org XServerاللاحقة RECORD معطوبة فيه. لن تعمل المفاتيح السريعة في القاموس الذهبي على الأغلب. ينبغي اصلاح هذا في الخادوم نفسه. رجاء اطلع على الآتي &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;مدخلة علة&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; واترك تعليقا هناك إن شئت.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;p dir=&quot;RTL&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;ملاحظة: يبدو أنك تعمل على إصدار X.Org XServer لديه ملحقة RECORD معطّلة. المفاتيح السريعة في القاموس الذهبي قد لا تعمل. يمكن إصلاح هذا في الخدم نفسه. فضلًا ارجع إلى &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;العلة هذه&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; واترك تعليقًا هناك إن أحببت.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>ال&amp;صوت</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
-        <translation>اللفظ</translation>
+        <translation>النطق</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
-        <translation>انطق بالكلمات آليا في النافذة الرئيسية</translation>
+        <translation>انطق تلقائيًّا الكلمات في النافذة الرئيسية</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
-        <translation>انطق بالكلمات آليا في منبثقة البحث</translation>
+        <translation>انطق تلقائيًّا الكلمات في منبثقة الاستكشاف</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
-        <translation type="unfinished">التشغيل</translation>
+        <translation>التشغيل</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
-        <translation type="unfinished"></translation>
+        <translation>شغّل ملفات الصوت بـ FFmpeg(libav) و libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="1294"/>
-        <source>Select this option to automatic collapse big articles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="1297"/>
-        <source>Collapse articles more than</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="1304"/>
-        <source>Articles longer than this size will be collapsed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferences.ui" line="1320"/>
-        <source>symbols</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Windows native playback API. Limited to .wav files only,
-but works very well.</source>
-        <translation type="obsolete">استخدم API الاصلية لمشغلات وندز. محصور بملفات .wav فقط،
-لكنه يعمل جيدا.</translation>
-    </message>
-    <message>
-        <source>Play via Windows native API</source>
-        <translation type="obsolete">شغل عبر API الموطنة في وندز</translation>
-    </message>
-    <message>
-        <source>Play audio via Phonon framework. May be somewhat unstable,
-but should support most audio file formats.</source>
-        <translation type="obsolete">شغل الصوت عبر إطار فونون. قد يكون غير مستقر نوعا ما،
-لكنه يدعم أغلب هيئات ملفات الصوت.</translation>
-    </message>
-    <message>
-        <source>Play via Phonon</source>
-        <translation type="obsolete">شغل عبر Phonon</translation>
+        <translation>استخدم المشغّل الداخلي</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
-        <translation>استخدم أيّة برنامج خارجي لتشغيل ملفات الصوت</translation>
+        <translation>استخدم أي برنامج خارجي لتشغيل ملفات الصوت</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
-        <translation>استخدم برنامجا خارجيا:</translation>
+        <translation>استخدم برنامجًا خارجيًا:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
-        <translation>ال&amp;شبكة</translation>
+        <translation>ال&amp;شّبكة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
-        <translation>مكن استخدام خادوم بروكسي لكل طلبات
-البرنامج الشبكية.</translation>
+        <translation>مكّنه إن وددت استخدام مُلقّم
+لجميع طلبات البرنامج في الشبكة.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
-        <translation>استخدم خادوم بروكسي</translation>
+        <translation>استخدم مُلقّمًا</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
-        <translation>النوع:</translation>
+        <translation>النّوع:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>المضيف:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>المنفذ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>المستخدم:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>كلمة المرور:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
-        <translation>تمكين هذا سيجعل القاموس الذهبي يحجب أغلب الاعلانات
-بمنع المحتوى (صور, اطارات) من خارج الموقع الذي تتصفحه.
-ان كانت بعض المواقع تتشوه بسبب ذلك, جرب تعطيله.</translation>
+        <translation>تمكين هذا يجعل القاموس الذهبي يمنع أغلب الإعلانات
+بعدم السماح بالمحتوى (صور، إطارات) غير المُنشأ من الموقع
+الذي تتصفّحه. إن انهارت بعض المواقع بسبب هذا، حاول تعطيله.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
-        <translation>لا تسمح بتحميل المحتوى من المواقع الاخرى (يخفي معظم الاعلانات)</translation>
+        <translation>امنع تحميل المحتوى من مواقع أخرى (يخفي أغلب الإعلانات)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
-        <translation type="unfinished"></translation>
+        <translation>تمكين هذا سيسمح بالاستماع إلى نطق الصوت
+من القواميس الموجودة على الإنترنت التي تعتمد
+مشغّل فلاش أو إضافات وِب. يجب تثبيت الإضافة
+ليعمل هذا الخيار.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>مكّن إضافات الوِب</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
-        <translation type="unfinished"></translation>
+        <translation>بعض المواقع تكتشف القاموس الذهبي من خلال ترويسات HTTP وتمنع الطلبات.
+مكّن هذا الخيار للالتفاف حول المشكلة.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
-        <translation type="unfinished"></translation>
+        <translation>لا تعرّف القاموس الذهبي في ترويسات HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
 informs the user about it and prompts to open a
 download page.</source>
-        <translation>عند تمكين هذا, سيتحقق البرنامج من التحديثات
-المتوفرة للتحميل من القاموس الذهبي. إن وجدت،
-سيعلم البرنامج المستخدم و يطلب اذنه لفتح صفحة
-التنزيل.</translation>
+        <translation>عند تمكين هذا، يلتمس البرنامج
+كل فترة إن كان هناك تحديث جديد
+للبرنامج متوفّر للتنزيل. إن كان كذلك،
+سيُعلمك البرنامج عنه ويطلب فتح صفحة التنزيل.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
-        <translation type="unfinished">تحقق من الاصدارات الحديثة غِبّا</translation>
+        <translation>التمس عن إصدار جديد للبرنامج كل فترة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
-        <source>Ad&amp;vanced</source>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
-        <source>ScanPopup extra technologies</source>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1346"/>
+        <source>Ad&amp;vanced</source>
+        <translation>مت&amp;قدّم</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1352"/>
+        <source>ScanPopup extra technologies</source>
+        <translation>تقنيات منبثقة الاستكشاف الإضافية</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>حاول أن تستخدم تقنية IAccessibleEx لاسترجاع الكلمة الواقعة تحت المؤشر.
+تعمل هذه التقنية فقط مع بعض البرمجيات التي تدعمها.
+(على سبيل المثال انترنت اكسبلورر 9)
+لا حاجة لانتقاء هذا الخيار إذا كنت لا تستخدم مثل هذه البرمجيات.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
-        <translation type="unfinished"></translation>
+        <translation>استخدم &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>حاول أن تستخدم تقنية أتمتة واجهة المُستخدم لاسترجاع الكلمة الواقعة تحت المؤشر.
+تعمل هذه التقنية فقط مع بعض البرمجيات التي تدعمها.
+لا حاجة لانتقاء هذا الخيار إذا كنت لا تستخدم مثل هذه البرمجيات.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
-        <translation type="unfinished"></translation>
+        <translation>استخدم أ&amp;تمتة واجهة المستخدم</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>حاول استخدام رسالة القاموس الذهبي لاسترجاع الكلمة تحت المؤشر.
+هذه التقنية تعمل فقط مع بعض البرامج وتدعمها.
+ليس مهمًّا تحديد هذا الخيار إن لم تكن تستخدم هكذا برنامج.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
-        <translation type="unfinished"></translation>
+        <translation>استخدم رسالة القاموس ال&amp;ذهبي</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>التأريخ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
-        <translation type="unfinished"></translation>
+        <translation>مكّن هذا الخيار لتخزين تأريخ الكلمات المترجمة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
-        <translation type="unfinished"></translation>
+        <translation>خزّن ال&amp;تأريخ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
-        <translation type="unfinished"></translation>
+        <translation>حدّد عدد المدخلات الأقصى لإبقائها في التأريخ.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
-        <translation type="unfinished"></translation>
+        <translation>حجم التأريخ الأقصى:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
-        <translation type="unfinished"></translation>
+        <translation>فترة حفظ التأريخ. إن عُيِّنت إلى 0، سيُحفظ التأريخ أثناء إنهاء التطبيق فقط.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
-        <translation type="unfinished"></translation>
+        <translation>احفظ كلّ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>دقيقة</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
-        <translation type="unfinished"></translation>
+        <translation>المقالات</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
-        <translation type="unfinished"></translation>
+        <translation>مكّن هذا الخيار لتوسيع الأجزاء الاختيارية من المقالات دائمًا</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
-        <translation type="unfinished"></translation>
+        <translation>وسّع الأ&amp;قسام الاختيارية</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
+        <source>Select this option to automatic collapse big articles</source>
+        <translation>حدّد هذا الخيار لطي المقالات الكبيرة تلقائيًّا</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1531"/>
+        <source>Collapse articles more than</source>
+        <translation>اطو المقالات الأكبر من الـ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1538"/>
+        <source>Articles longer than this size will be collapsed</source>
+        <translation>المقالات الأكبر من هذا الحجم ستطوى</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1554"/>
+        <source>symbols</source>
+        <translation>رمز</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
-        <translation>افتراضيات النظام</translation>
+        <translation>افتراضي النظام</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
-        <translation>الافتراضيات</translation>
+        <translation>الافتراضي</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
-        <translation type="unfinished"></translation>
+        <translation>عصري</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
-        <translation type="unfinished">لينغفو</translation>
+        <translation>لنغفو</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
-        <translation type="unfinished"></translation>
+        <translation>بابيلون</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
-        <translation type="unfinished"></translation>
+        <translation>لِنْغوز</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>لِنْغوز-بلو</translation>
     </message>
     <message>
-        <source>Play via DirectShow</source>
-        <translation type="obsolete">اعرض خلال DirectShow</translation>
-    </message>
-    <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
-        <translation>تغيير اللغة</translation>
+        <translation>يغيّر اللغة</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
-        <translation>اعد تشغيل البرنامج لتطبيق تغيير اللغة.</translation>
+        <translation>أعد تشغيل البرنامج لتطبيق تغيير اللغة.</translation>
     </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>صوت</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
-        <translation type="unfinished"></translation>
+        <translation>نص مجرّد</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
-        <translation type="unfinished"></translation>
+        <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
-        <translation type="unfinished"></translation>
+        <translation>طابِق السابقة</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>غير معروف</translation>
     </message>
 </context>
 <context>
@@ -3423,143 +3873,145 @@
     <message>
         <location filename="../programs.cc" line="176"/>
         <source>No program name was given.</source>
-        <translation type="unfinished"></translation>
+        <translation>لم يُعطَ اسم للبرنامج.</translation>
     </message>
     <message>
         <location filename="../programs.cc" line="192"/>
         <source>The program has crashed.</source>
-        <translation type="unfinished"></translation>
+        <translation>انهار البرنامج.</translation>
     </message>
     <message>
         <location filename="../programs.cc" line="195"/>
         <source>The program has returned exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>أرجعَ البرنامج شِفرة الخروج %1.</translation>
     </message>
 </context>
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
-        <translation type="unfinished">مفعل</translation>
+        <translation>ممكّن</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>النوع</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
-        <translation type="unfinished">الاسم</translation>
+        <translation>الاسم</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
-        <translation type="unfinished"></translation>
+        <translation>سطر الأوامر</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>الرّمز</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ في تحميل المقالة</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ في فك ترميز المقالة</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="140"/>
         <source>avformat_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل avformat_alloc_context().</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="147"/>
         <source>av_malloc() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل av_malloc().</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="156"/>
         <source>avio_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل avio_alloc_context().</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="173"/>
         <source>avformat_open_input() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل avformat_open_input(): %1.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="180"/>
         <source>avformat_find_stream_info() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل avformat_find_stream_info(): %1.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="195"/>
         <source>Could not find audio stream.</source>
-        <translation type="unfinished"></translation>
+        <translation>تعذّر العثور على دفق الصوت.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="203"/>
         <source>Codec [id: %1] not found.</source>
-        <translation type="unfinished"></translation>
+        <translation>لم يُعثر على المرماز [المعرّف: %1].</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="210"/>
         <source>avcodec_open2() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشلavcodec_open2(): %1.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="271"/>
         <source>Cannot find usable audio output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>تعذّر العثور على جهاز خرج صوت قابل للاستخدام.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="284"/>
         <source>Unsupported sample format.</source>
-        <translation type="unfinished"></translation>
+        <translation>صيغة النموذج غير مدعومة.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="294"/>
         <source>ao_open_live() failed: </source>
-        <translation type="unfinished"></translation>
+        <translation>فشل ao_open_live(): </translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="299"/>
         <source>No driver.</source>
-        <translation type="unfinished"></translation>
+        <translation>لا تعريف.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="302"/>
         <source>This driver is not a live output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>هذا التعريف ليس جهاز خرج حيّ.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="305"/>
         <source>A valid option key has an invalid value.</source>
-        <translation type="unfinished"></translation>
+        <translation>مفتاح خيار صالح يملك قيمة غير صالحة.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="308"/>
         <source>Cannot open the device: %1, channels: %2, rate: %3, bits: %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>تعذّر فتح الجهاز: %1، القنوات: %2، المعدّل: %3، البتات: %4.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="315"/>
         <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ غير معروف.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="340"/>
         <source>avcodec_alloc_frame() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>فشل avcodec_alloc_frame().</translation>
     </message>
 </context>
 <context>
@@ -3567,49 +4019,49 @@
     <message>
         <location filename="../groups_widgets.cc" line="1023"/>
         <source>Dictionary search/filter (Ctrl+F)</source>
-        <translation type="unfinished"></translation>
+        <translation>رشّح/ابحث في القاموس (Ctrl+F)</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="1032"/>
         <source>Quick Search</source>
-        <translation type="unfinished"></translation>
+        <translation>بحث سريع</translation>
     </message>
     <message>
         <location filename="../groups_widgets.cc" line="1037"/>
         <source>Clear Search</source>
-        <translation type="unfinished"></translation>
+        <translation>امحُ البحث</translation>
     </message>
 </context>
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
-        <translation type="unfinished"></translation>
+        <translation>خطأ في حفظ المورد: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
-        <translation type="unfinished">فشل تنزيل المرجع المشار إليه.</translation>
+        <translation>فشل تنزيل المورد المشار إليه.</translation>
     </message>
 </context>
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
-        <translation>هيبورن روماجي لالهيراجانا</translation>
+        <translation>رومانجي هِپ‌بيرن للهيراجانا</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
-        <translation>هيبورن روماجي لكاتاكانا</translation>
+        <translation>رومانجي هِپ‌بيرن للكاتاكانا</translation>
     </message>
 </context>
 <context>
@@ -3617,7 +4069,7 @@
     <message>
         <location filename="../russiantranslit.cc" line="107"/>
         <source>Russian Transliteration</source>
-        <translation>الترجمة الصوتية الروسية</translation>
+        <translation>النسخ الروسي الحرفي</translation>
     </message>
 </context>
 <context>
@@ -3625,98 +4077,82 @@
     <message>
         <location filename="../scanpopup.ui" line="14"/>
         <source>Dialog</source>
-        <translation>مربع حوار</translation>
-    </message>
-    <message>
-        <source>word</source>
-        <translation type="obsolete">كلمة</translation>
+        <translation>الحوار</translation>
     </message>
     <message>
-        <source>List Matches (Alt+M)</source>
-        <translation type="obsolete">اسرد المقابلات (Alt+M)</translation>
+        <location filename="../scanpopup.ui" line="113"/>
+        <source>Back</source>
+        <translation>ارجع</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
-        <source>Back</source>
-        <translation type="unfinished">ارجع</translation>
-    </message>
-    <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
-        <translation type="unfinished">تقدم</translation>
-    </message>
-    <message>
-        <source>Alt+M</source>
-        <translation type="obsolete">Alt+M</translation>
+        <translation>تقدّم</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>انطق الكلمة (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
-        <translation type="unfinished"></translation>
+        <translation>أرسل الكلمة إلى النافذة الرئيسية (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
-        <translation>أظهر أو أخف شريط القاموس</translation>
+        <translation>يُظهر أو يخفي شريط القاموس</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
-        <translation type="unfinished">استخدم هذا لتعليق النافذة وابقاءها على الشاشة،
-يمكن تغيير حجمها أو ادارتها بطرق أخرى.</translation>
-    </message>
-    <message>
-        <source>GoldenDict</source>
-        <translation type="obsolete">القاموس الذهبي</translation>
+        <translation>استخدم هذا لتثبيت النافذة فتبقى على الشاشة،
+يمكن تغيير حجمها أو إدارتها بطرق عدّة.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
 </context>
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>المسار</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>الاسم</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>الرّمز</translation>
     </message>
 </context>
 <context>
@@ -3724,19 +4160,20 @@
     <message>
         <location filename="../sources.ui" line="37"/>
         <source>Files</source>
-        <translation>ملفات</translation>
+        <translation>الملفات</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="43"/>
         <source>Paths to search for the dictionary files:</source>
-        <translation>مسار البحث عن ملفات القواميس</translation>
+        <translation>المسارات للبحث فيها عن ملفات القواميس:</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="57"/>
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>أ&amp;ضف...</translation>
     </message>
@@ -3745,34 +4182,35 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
-        <translation>ا&amp;مسح</translation>
+        <translation>أ&amp;زل</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="84"/>
         <source>Re&amp;scan now</source>
-        <translation>ا&amp;بحث مجددا</translation>
+        <translation>أعد الا&amp;كتشاف الآن</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="100"/>
         <source>Sound Dirs</source>
-        <translation>مجلدات الصوت</translation>
+        <translation>أدلة الصوت</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="106"/>
         <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
-        <translation>اعمل قواميسا من مجموعة من الملفات الصوتية بإضافة المسار هنا:</translation>
+        <translation>اعمل قواميس من مجموعات من ملفات الصوت بإضافة المسارات هنا:</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="156"/>
         <source>Morphology</source>
-        <translation>الصرف</translation>
+        <translation>الصَرْف</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="162"/>
         <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
-        <translation>مسار قواميس Hunspell/Myspell:</translation>
+        <translation>المسار إلى دليل بقواميس Hunspell/Myspell:</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="178"/>
@@ -3782,7 +4220,7 @@
     <message>
         <location filename="../sources.ui" line="187"/>
         <source>Available morphology dictionaries:</source>
-        <translation>القواميس الصرفية المتوفرة:</translation>
+        <translation>قواميس الصَرْف المتوفّرة:</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="199"/>
@@ -3792,12 +4230,13 @@
 spelling suggestions for mistyped words.
 Add appropriate dictionaries to the bottoms
 of the appropriate groups to use them.</source>
-        <translation>كل قاموس صرفي يظهر
+        <translation>كل قاموس صَرْف يظهر
 كقاموس مساعد منفصل
-ليقدم كلمات جذعية للبحث
-و اقتراحات هجائية للكلمات الخطأ
-أضف القواميس الملائمة لأسفل
-المجموعة المناسبة لاستخدامهم.</translation>
+حيث يقدّم جذر الكلمة للبحث
+واقتراحات الإملاء للكلمات
+الخاطئة. أضف القواميس
+المناسبة إلى أسفل المجموعات
+المناسبة لاستخدامها.</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="224"/>
@@ -3807,256 +4246,247 @@
     <message>
         <location filename="../sources.ui" line="230"/>
         <source>Wikipedia (MediaWiki) sites:</source>
-        <translation>مواقع (ميديا ويكي) لويكيبيديا:</translation>
+        <translation>مواقع ويكيبيديا (ميدياويكي):</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="283"/>
         <source>Websites</source>
-        <translation>مواقع</translation>
+        <translation>مواقع الوِب</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="289"/>
         <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
-        <translation>اية مواقع مع العبارة %GDWORD% ستستبدل بكلمة الطلب:</translation>
+        <translation>أي مواقع للوِب. السلسلة %GDWORD% ستُستبدل بكلمة الاستعلام:</translation>
     </message>
     <message>
-        <source>Alternatively, use %GD1251% for CP1251, %GDISO1% for ISO 8859-1.</source>
-        <translation type="obsolete">كبيديل استخدم %GD1251% for CP1251, %GDISO1% for ISO 8859-1.</translation>
+        <location filename="../sources.ui" line="334"/>
+        <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
+%GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
+        <translation>إضافةً إلى ذلك، استخدم %GD1251% لـ CP1251، و %GDISO1% لـ ISO 8859-1، و %GDISO16% لـ ISO 8859-16، و
+%GDBIG5% لـ Big-5، و %GDBIG5HKSCS% لـ Big5-HKSCS، و %GDGBK% لـ GBK و GB18030، و %GDSHIFTJIS% لـ Shift-JIS.</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="347"/>
-        <source>Programs</source>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="403"/>
+        <source>Programs</source>
+        <translation>البرامج</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
+        <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
+        <translation>أي برامج خارجية، السلسلة %GDWORD% ستُستبدل بكلمة الاستعلام. إن لم تُقدَّم هكذا سلسلة، ستُغذّى الكلمة إلى الإدخال القياسي.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
-        <translation type="unfinished">فروفو</translation>
+        <translation>فورڤو</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
-        <translation type="unfinished">تهجئة حية من &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. هذا الموقع يسمح للناس بتسجيل ومشاركة لفظ الكلمات. يمكنك الاستماع لها داخل GoldenDict.</translation>
+        <translation>نطق حيّ من &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. هذا الموقع يسمح للناس بتسجيل ومشاركة نطق الكلمة. يمكنك الإستماع إليها من القاموس الذهبي.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
-        <translation type="unfinished">فعّل الترجمة من فروفو</translation>
+        <translation>مكّن النطق من فورڤو</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
-        <translation type="unfinished">مفتاح API:</translation>
+        <translation>مفتاح API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
-        <translation type="unfinished">استخدام فروفو حاليا يتطلب مفتاح API. اترك الحقل هذا
-فارغا لاستخدام المفتاح الافتراضي، الذي قد يتعطل
-في المستقبل، أو سجل عبر الموقع لتحصل على مفتاحك الخاص.</translation>
+        <translation>استخدام فورڤو حاليًّا يتطلّب مفتاح API. اترك هذا الحقل
+فارغًا إن أردت استخدام الافتراضي، والذي قد لا يتوفّر في
+المستقبل، أو سجّل في موقعنا للحصول على مفتاحك الخاص.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
-&lt;tr&gt;
-&lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;, or leave blank to use the default one.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
-&lt;tr&gt;
-&lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;احصل على مفتاحك الخاص &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;, or leave blank to use the default one.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../sources.ui" line="334"/>
-        <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
-%GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources.ui" line="353"/>
-        <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
-        <translation type="unfinished"></translation>
+        <translation>احصل على مفتاحك الخاص من &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;هنا&lt;/a&gt;، أو اتركه فارغًا لاستخدام الافتراضي.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
-        <translation type="unfinished">رموز اللغات (مفصولة بالفاصلة):</translation>
+        <translation>ترميزات اللغة (مقسّمة بفواصل):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
-        <translation type="unfinished">قائمة برموز اللغات التي ترغب بها. مثال: &quot;en, ru&quot;.</translation>
+        <translation>قائمة ترميزات اللغة التي تريد امتلاكها. مثال: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
-        <translation type="unfinished">قائمة كاملة برموز اللغات &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;هنا&lt;/a&gt;.</translation>
+        <translation>القائمة الكاملة من ترميزات اللغة متوفّرة &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;هنا&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
-        <translation>الترجمة الصوتية</translation>
+        <translation>النسخ الحرفي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
-        <translation>الترجمة الصوتية الروسية</translation>
+        <translation>النسخ الروسي الحرفي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
-        <translation>الترجمة الصوتية اليونانية</translation>
+        <translation>النسخ اليوناني الحرفي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
-        <translation>الترجمة الصوتية الألمانية</translation>
+        <translation>النسخ الألماني الحرفي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
-        <translation type="unfinished"></translation>
+        <translation>النسخ البلاروسي الحرفي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
-        <translation>يمكنك من استخدام الأبجدية اللاتينية لكتابة اللغة اليابانية</translation>
+        <translation>يمكّن استخدام الأبجدية اللاتينية لكتابة اللغة اليابانية</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
-        <translation>اليابانية روماجي</translation>
+        <translation>روماجي اليابانية</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>الأنظمة:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
-        <translation>الاسلوب الأكثر شيوعا لل transcription اليابانية,
-يعتمد على الصوتية الانكليزية</translation>
+        <translation>الطريقة الأكثر استخدامًا لنسخ اليابانية،
+مبنية على الفونولوجيا الإنجليزية</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
-        <translation type="unfinished">هيبورن</translation>
+        <translation>هِپ‌بيرن</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
 Not implemented yet in GoldenDict.</source>
-        <translation type="unfinished">الاسلوب الاكثر اعتيادا, بعلاقة واحد مقابل واحد لأنظمة كتابة الكانا
-مقياس قياسي ISO 3602
+        <translation>النظام الأكثر اعتيادية، لهُ علاقة واحد إلى واحد لأنظمة
+كتابة الكانا، موحّدة كـ ISO 3602
 
-غير مطبق بعد في القاموس الذهبي.</translation>
+لم يُنفَّذ حتى الآن في القاموس الذهبي.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
-        <translation>نيهون-سيكي</translation>
+        <translation>نيهون-شيكي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
 Not implemented yet in GoldenDict.</source>
-        <translation>يعتمد على نظام نيهون-سيكي, لكنه معدل للمواصفات القياسية اليابانية الحديثة
-مقياس قياسي ISO 3602
+        <translation>مبني على نيهون-شيكي، لكن مُعدَّل لليابانية العصرية القياسية.
+موحّدة كـ ISO 3602
 
-غير مضمن بعد في القاموس الذهبي.</translation>
+لم يُنفَّذ حتى الآن في القاموس الذهبي.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
-        <translation>كنري-سيكي</translation>
+        <translation>كنريه-شيكي</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
-        <translation>سيليباري:</translation>
+        <translation>الكتابة المقطعية:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
-        <translation>هيراغانا سلبري اليابانية</translation>
+        <translation>الكتابة اليابانية الهيراجانا المقطعية</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>الهيراجانا</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
-        <translation>كاتاكانا سلبري اليابانية</translation>
+        <translation>الكتابة اليابانية الكاتاكانا المقطعية</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
-        <translation>الكتكانا</translation>
+        <translation>الكاتاكانا</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
-        <translation type="unfinished"></translation>
+        <translation>قراءة النّصوص</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
-        <translation>(غير متوفر في النسخة المتنقلة)</translation>
+        <translation>(ليس متوفّرًا في الإصدار المحمول)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
-        <translation>اختر قاموسا</translation>
+        <translation>اختر قاموسًا</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
-        <translation>أكد الحذف</translation>
+        <translation>تأكيد الإزالة</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation>اأزيل القاموس &lt;b&gt;%1&lt;/b&gt; من القائمة؟</translation>
+        <translation>أأزيل القاموس &lt;b&gt;%1&lt;/b&gt; من القائمة؟</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation>اأزيل القاموس &lt;b&gt;%1&lt;/b&gt; من القائمة؟</translation>
+        <translation>أأزيل الموقع &lt;b&gt;%1&lt;/b&gt; من القائمة؟</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>أأزيل البرنامج &lt;b&gt;%1&lt;/b&gt; من القائمة؟</translation>
     </message>
 </context>
 <context>
@@ -4064,7 +4494,7 @@
     <message>
         <location filename="../stylescombobox.cc" line="17"/>
         <source>None</source>
-        <translation type="unfinished">لاشيء</translation>
+        <translation>لاشيء</translation>
     </message>
 </context>
 <context>
@@ -4072,77 +4502,77 @@
     <message>
         <location filename="../texttospeechsource.ui" line="33"/>
         <source>Selected voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>محركات الصوت المحدّدة:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="53"/>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>أ&amp;ضف</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="60"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished">ا&amp;مسح</translation>
+        <translation>أ&amp;زل</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="84"/>
         <source>Preferences</source>
-        <translation type="unfinished">التفضيلات</translation>
+        <translation>تفضيلات</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="90"/>
         <source>Volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>الحجم:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="119"/>
         <source>Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>المعدّل:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="151"/>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>معاينة</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="165"/>
         <source>Available voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>محركات الصوت المتوفّرة:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="183"/>
         <source>Text to be previewed:</source>
-        <translation type="unfinished"></translation>
+        <translation>النص لمعاينته:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="190"/>
         <source>Type text to be previewed here.</source>
-        <translation type="unfinished"></translation>
+        <translation>اطبع نصًّا هنا لعرضه.</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="224"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;عاين</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="58"/>
         <source>No TTS voice available</source>
-        <translation type="unfinished"></translation>
+        <translation>لم يُعثر على صوت TTS</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="59"/>
         <source>Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</source>
-        <translation type="unfinished"></translation>
+        <translation>تعذّر العثور على صوت TTS.&lt;br&gt;فضلًا تأكد من وجود محرك TTS بالإصدار الأخير مثبّت على حاسوبك.</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="79"/>
         <source>Confirm removal</source>
-        <translation type="unfinished">أكد الحذف</translation>
+        <translation>تأكيد الإزالة</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="80"/>
         <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>أأزيل محرك الصوت &lt;b&gt;%1&lt;/b&gt; من القائمة؟</translation>
     </message>
 </context>
 <context>
@@ -4150,12 +4580,12 @@
     <message>
         <location filename="../translatebox.cc" line="103"/>
         <source>Type a word or phrase to search dictionaries</source>
-        <translation type="unfinished"></translation>
+        <translation>اطبع كلمة أو عبارة للبحث في القواميس</translation>
     </message>
     <message>
         <location filename="../translatebox.cc" line="125"/>
         <source>Drop-down</source>
-        <translation type="unfinished"></translation>
+        <translation>القائمة المنسدلة</translation>
     </message>
 </context>
 <context>
@@ -4163,53 +4593,53 @@
     <message>
         <location filename="../texttospeechsource.cc" line="233"/>
         <source>Enabled</source>
-        <translation type="unfinished">مفعل</translation>
+        <translation>ممكّن</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="235"/>
         <source>Name</source>
-        <translation type="unfinished">الاسم</translation>
+        <translation>الاسم</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="237"/>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation>المعرّف</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="239"/>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>الأيقونة</translation>
     </message>
 </context>
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
-        <translation>مفعل</translation>
+        <translation>ممكّن</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>الاسم</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>العنوان</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>الرّمز</translation>
     </message>
 </context>
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
-        <translation>فشل طلب بعض القواميس.</translation>
+        <translation>فشل الاستعلام عن بعض القواميس.</translation>
     </message>
 </context>
 <context>
@@ -4217,7 +4647,7 @@
     <message>
         <location filename="../wordlist.cc" line="113"/>
         <source>WARNING: %1</source>
-        <translation type="unfinished">تحذير: %1</translation>
+        <translation>تحذير: %1</translation>
     </message>
 </context>
 </TS>
diff -Nru goldendict-1.5.0~git20131003/locale/ay_WI.ts goldendict-1.5.0~git20150923/locale/ay_WI.ts
--- goldendict-1.5.0~git20131003/locale/ay_WI.ts	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/ay_WI.ts	2015-09-23 08:26:24.000000000 +0000
@@ -342,6 +342,25 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished">Mantawi:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <source>Form</source>
@@ -420,6 +439,97 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Jan saña</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <source>Total articles:</source>
@@ -458,6 +568,14 @@
 %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DictListModel</name>
@@ -467,6 +585,62 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Suti</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -496,6 +670,10 @@
         <source>Extended menu with all dictionaries...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditDictionaries</name>
@@ -540,6 +718,75 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ni maya</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ni maya</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <source>XML parse error: %1 at %2,%3</source>
@@ -571,6 +818,53 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Jan saña</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <source>German Transliteration</source>
@@ -716,6 +1010,53 @@
         <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
         <translation>&quot;Aru pirwa tamanakar uskuñataki uchaku apnakam&quot; uru pirwanaka tamarunakaru, ukhamaraki tamanak lantiñatakiwa, achakumpi katatayampi.&quot; </translation>
     </message>
+    <message>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Qhipa</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Arkiri</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">Jach&apos;antaña </translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Jisk&apos;antaña</translation>
+    </message>
+    <message>
+        <source>Normal Size</source>
+        <translation type="unfinished">Tamaño normal</translation>
+    </message>
+    <message>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HistoryPaneWidget</name>
@@ -2828,6 +3169,39 @@
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mdx::MdxArticleRequest</name>
@@ -2885,7 +3259,7 @@
     </message>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <source>Inactive (disabled) dictionaries:</source>
@@ -2935,6 +3309,14 @@
         <source>Sort by languages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
@@ -3541,6 +3923,38 @@
         <source>Articles longer than this size will be collapsed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
@@ -4106,6 +4520,14 @@
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StylesComboBox</name>
diff -Nru goldendict-1.5.0~git20131003/locale/be_BY@latin.ts goldendict-1.5.0~git20150923/locale/be_BY@latin.ts
--- goldendict-1.5.0~git20131003/locale/be_BY@latin.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/be_BY@latin.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Niaviedamaja]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Na padstavie Qt %1 (%2, %3 bity)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Razharnuć artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Zharnuć artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>GoldenDict nie znajšoŭ pierakładu dla &lt;b&gt;%1&lt;/b&gt; u grupie &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>GoldenDict nie znajšoŭ pierakładu ŭ grupie &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Vitajem!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Vitajem u &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Pierš za ŭsio naviedaj &lt;b&gt;Źmieny|Słoŭniki&lt;/b&gt;, kab paznačyć šlachi da słoŭnikavych fajłaŭ, ź jakich budzie stanavicca biblijateka słoŭnikaŭ, dadaj roznyja sajty Vikipedyi j inšyja krynicy, vyznačy paradak słoŭnikaŭ dy stvary słoŭnikavyja grupy.&lt;p&gt;Pa naładžvańni pragrama budzie hatovaja da prahladu słoŭnikavych artykułaŭ. Toje možna rabić u hetym aknie (upišy šukanaje słova ŭ radok šukańnia) ci ŭ vonkavych pragramach z dapamohaju &lt;a href=&quot;Karystańnie słoŭnikam u vonkavych pragramach&quot;&gt;vypłyŭnych voknaŭ&lt;/a&gt;. &lt;p&gt;Kab dapasavać da siabie pragramu, skarystaj dastupnyja nałady ŭ &lt;b&gt;Źmienach|Naładach&lt;/b&gt;. Usie źmieščanyja tam nałady majuć padkazki. Čytaj ich dla peŭnaści ŭ zroblenych źmienach.&lt;p&gt;Kali ŭźnikli pytańni, prapanovy, ci prosta zachaciełasia znać mierkavańni ludziej, to zaprašajem na naš &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Novyja versii pragramy zaŭsiody možna znajści na našym &lt;a href=&quot;http://goldendict.org/&quot;&gt;sajcie&lt;/a&gt;.&lt;p&gt;(c) 2008-2013 Kanstancin Isakaŭ. Licenzija GPLv3 ci paźniejšaja.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Karystańnie słoŭnikam u vonkavych pragramach</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Karystańnie słoŭnikam u vonkavych pragramach&lt;/h3&gt;Kab šukać słovy ŭ słoŭniku z-pad inšych pragramaŭ, treba padłučyć &lt;i&gt;mechanizm vypłyŭnych voknaŭ&lt;/i&gt; u &lt;b&gt;Naładach&lt;/b&gt;, i zacisnuć knopku „Vypłyŭnyja vokny“ ŭ hałoŭnym aknie, ci ŭłučyć adpaviedny punkt kantekstnaha meniu značka ŭ systemnym łotku. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Zatym u kožnaj pragramie prosta spyni kursor myšy nad słovam, i praz chvilu źjavicca vypłyŭnoje akno z adpaviednym artykułam.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Zatym u kožnaj pragramie prosta abiary słova myššu (dvojčy pstrykni ci praviadzi pa słovie kursoram myšy z zacisnutaj levaj knopkaj), i praz chvilu źjavicca vypłyŭnoje akno z adpaviednym artykułam.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(nienazvanaja)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(vidarys)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Razharnuć artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Z </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Zharnuć artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Pamyłka zapytu: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Padobnyja słovy: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Słovazłučeńni: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Słovy paasobku: </translation>
     </message>
@@ -148,219 +148,222 @@
         <translation>Chorma</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Šukać:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Papiaredni</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Nastupny</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Paznačyć &amp;usie</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Roźnić registar</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Vybrać dziejny artykuł</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Skapijavać jak tekst</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspektar</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Resurs</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Aŭdyjo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Syntezatar hołasu</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Vidarys</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Videa</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Videa: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Aznačeńnie z słoŭnika „%1“: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Aznačeńnie: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Zapytanaha resursu nie isnuje.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Paznačanaj pragramy nie isnuje.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>PAMYŁKA: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Zachavańnie huku</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Hukavyja fajły (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Usie fajły (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Zachavańnie vyjavy</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Fajły vyjavaŭ (*.bmp *.jpg *.png *.tif);;Usie fajły (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Adčynić spasyłku</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Ačynić spasyłku ŭ novaj &amp;układcy</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Adčynić spasyłku ŭ &amp;vonkavym ahladalniku</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Zachavać &amp;vyjavu...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Zachavać &amp;huk...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Šukać „%1“</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Šukać „%1“ u &amp;novaj układcy</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Źmiaścić „%1“ u ŭvodnym radku</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Dadać „%1“ da historyi</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Šukać „%1“ u grupie %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Šukać „%1“ u grupie %2 u novaj u&amp;kładcy</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>PAPIAREDŽAŃNIE: Prajhravalnik FFMpeg: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>UVAHA: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Nia zdoleŭ zapuścić prajhravalnika hukavaha fajła: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Nia zdoleŭ stvaryć časovaha fajła.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Nia zdoleŭ aŭtamatyčna adčynić resursavaha fajła. Pasprabuj adčynić ručna %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Nia zdoleŭ zładavać paznačanaha resursu.</translation>
     </message>
@@ -386,6 +389,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Parol:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -486,6 +512,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Tekstavyja fajły (*.txt);;Usie fajły (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Skasavać</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -528,6 +667,16 @@
         <translation>Apisańnie:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -543,6 +692,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Nazva</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Adras</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Značak</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -560,17 +777,22 @@
         <translation>Redagavać hetuju grupu</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Infarmacyja pra słoŭnik</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Adčynić słoŭnikavy katalog</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Redagavać słoŭnik</translation>
     </message>
@@ -583,39 +805,39 @@
         <translation>Słoŭniki</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Krynicy</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Słoŭniki</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>G&amp;rupy</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Krynicy źmianilisia</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Kolki krynic źmianiłasia. Ci ŭžyć źmieny?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Užyć</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Skasavać</translation>
     </message>
@@ -629,6 +851,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Niama</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Niama</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -667,6 +975,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Skasavać</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -797,7 +1164,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Vydalić usie grupy</translation>
     </message>
@@ -807,42 +1174,100 @@
         <translation>Pieraciahvaj słoŭniki ŭ/z grupy. Raźmiarkoŭvaj ich u grupie z dapamohaju myšy.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Dadać grupu</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Zadaj nazvu novaj grupy:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Pieranazvańnie grupy</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Zadaj novuju nazvu grupy:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Vydaleńnie grupy</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Sapraŭdy žadaješ vydalić grupu &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Sapraŭdy žadaješ vydalić usie grupy?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Nazad</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Napierad</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Pavialičyć</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Pamienšyć</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Zvyčajny pamier</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -873,12 +1298,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Artagrafičnyja padkazki: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Marfalogija %1</translation>
     </message>
@@ -886,12 +1311,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Ułučana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nazva</translation>
     </message>
@@ -1931,7 +2356,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Pamyłka pry ładavańni słoŭnikaŭ</translation>
     </message>
@@ -1939,7 +2364,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Abmyłka ŭ fajle kanfiguracyi. Praciahnuć z standartnymi naładami?</translation>
     </message>
@@ -1948,534 +2373,575 @@
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Vitajem!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Fajł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>Ź&amp;mieny</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Dapamoha</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Vyhlad</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Sumier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historyja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Panel &amp;šukańnia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Panel &amp;navigacyi ŭ vynikach</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Panel &amp;historyi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Słoŭniki...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Nałady...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Chatniaja bačyna</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Infarmacyja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Infarmacyja pra GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Vyjści</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Vyjści z pragramy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>Źvinuć u &amp;łotak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Źvinuć akno ŭ łotak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Zachavać artykuł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Zachavać artykuł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>Na&amp;drukavać</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Nałady &amp;bačyny</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Pieradpr&amp;ahlad druku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Piera&amp;skanavać fajły</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Ačyścić</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Novaja ŭkładka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Tečka &amp;kanfiguracyi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Pakazać</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>Z&amp;ekspartavać</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>Z&amp;ympartavać</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Zaŭsiody na &amp;viersie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Zaŭsiody na viersie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Knopka meniu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Pakazvać &amp;nazvy ŭ słoŭnikavaj palicy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Pakazvać małyja znački ŭ palicy &amp;pryładaŭ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Palica &amp;meniu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigacyja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Nazad</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Napierad</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Ułučyć pracu ŭ vonkavych pragramach</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Vymavić słova (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Pavialičyć</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Pamienšyć</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Zvyčajny pamier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Šukać u:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Znojdziena ŭ nastupnych słoŭnikach:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Pavialičyć radok šukańnia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Pamienšyć radok šukańnia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Zvyčajny pamier radka šukańnia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Pakazać &amp;hałoŭnaje akno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Adčynienyja ŭkładki</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Začynić dziejnuju ŭkładku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Začynić usie ŭkładki</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Začynić usie ŭkładki aproč dziejnaj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Ładavańnie...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Novaja ŭkładka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 słoŭnikaŭ, %2 artykułaŭ, %3 słovaŭ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Šukać:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Usie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Adčynić śpis układak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(biaz nazvy)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Pamyłka inicyjalizacyi cikavańnia klavišnych skarotaŭ.&lt;br&gt;Pierakanajsia, što XServer maje ŭłučanaje pašyreńnie RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Dastuny novy vypusk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>GoldenDict versii &lt;b&gt;%1&lt;/b&gt; dastupny dla załadavańnia.&lt;br&gt;Pstrykni pa &lt;b&gt;Zładavać&lt;/b&gt;, kab pierajści na bačynu ściahvańnia.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Zładavać</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Praminuć hety vypusk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Accessibility API nia ŭłučany</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Palica meniu jość schavanaja. Skarystaj %1, kab pavaracić nazad.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Nałady bačyny</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Niama dasiažnych drukarak. Spačatku ŭstaluj choć adnu.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Nadrukavać artykuł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artykuł całkom (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artykuł, tolki HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Zachavać artykuł jak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Pamyłka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Niamožna zachavać artykuł: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Zachoŭvańnie artykuła...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Hałoŭnaje akno ciapier zaŭsiody znachodzicca vyšej inšych.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>S&amp;chavać</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Ekspartavańnie historyi ŭ fajł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Tekstavyja fajły (*.txt);;Usie fajły (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Ekspartavańnie historyi končyłasia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Pamyłka ekspartu: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Impartavańnie historyi z fajła</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Pamyłka impartavańnia: chibnyja źviestki ŭ fajle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Impartavańnie historyi končyłasia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Pamyłka impartavańnia: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Infarmacyja pra słoŭnik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Adčynić słoŭnikavy katalog</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Redagavać słoŭnik</translation>
     </message>
@@ -2483,12 +2949,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Słoŭnikavy fajł skažony ci paškodžany</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Abmyłka ładavańnia artykuła z %1, z pryčyny: %2</translation>
     </message>
@@ -2496,7 +2962,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Pamyłka razboru fajła XML: %1 — radok %2, słupok %3</translation>
     </message>
@@ -2504,7 +2970,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Pamyłka razboru fajła XML: %1 — radok %2, słupok %3</translation>
     </message>
@@ -2512,22 +2978,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Ułučany</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nazva</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adras</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Značak</translation>
     </message>
@@ -2540,88 +3006,94 @@
         <translation>Chorma</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Paradak słoŭnikaŭ:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Nieŭžyvanyja (vyłučanyja) słoŭniki:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Infarmacyja pra słoŭnik</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nazva:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Usiaho artykułaŭ:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Usiaho słovaŭ:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Kryničnaja mova:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Metavaja mova:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Apisańnie:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Fajły, jakija składajuć słoŭnik:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Uparadkuj słoŭniki, raźmierkavaŭšy ich myššu. Kab nie ŭžyvać słoŭnika, pieraciahni jaho ŭ grupu vyłučanych słoŭnikaŭ.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Sartavać pavodle nazvy</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Sartavać pavodle movy</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Šlach</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Rekursiŭna</translation>
     </message>
@@ -2779,22 +3251,27 @@
         <translation>Dadatkovy styl:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Nastaŭ hetaje značeńnie, kab unikać vialikich meniušak.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Hranica kolkaści słoŭnikaŭ u vypadnym meniu:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Karystańnie zvonku</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2805,134 +3282,134 @@
 akna ŭ hałoŭnym aknie ci ŭ systemnym łotku.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Ułučyć mechanizm vypłyŭnych voknaŭ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Vyznačaje ci ŭłučać vonkavyja vypłyŭnyja vokny pry startavańni pragramy.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Startavać razam z ułučanymi vypłyŭnymi voknami</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Pakazvać vypłyŭnoje akno tolki tady, kali karystalnik zaciśnie ŭsie paznačanyja klavišy.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Pakazvać vypłyŭnoje akno tolki pry nastupnych zacisnutych klavišach:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Tolki levy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Levy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Tolki pravy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Pravy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Klaviš Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Klaviš Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Tolki levy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Levy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Klaviš Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Tolki pravy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Pravy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Tolki pravy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Pravy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Tolki levy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Levy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows-klaviš ci Meta-klaviš</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2943,12 +3420,12 @@
 i praz peŭny čas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Klavišy možna nacisnuć i praz</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2956,42 +3433,42 @@
 abmiežavanuju kolkaść sekundaŭ, jakaja j zadajecca tut.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Słać pierakładanaje słova ŭ hałoŭnaje akno zamiest vyklikańnia vypłyŭnoha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Słać pierakładanaje słova ŭ hałoŭnaje akno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Klavišnyja skaroty</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Vykarystoŭvać nastupny skarot dla vyklikańnia hałoŭnaha akna:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Vykarystoŭvać nastupny skarot dla pierakładu słova z kišeni:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Klavišnyja skaroty jość glabalnymi i dziejničajuć u kožnaj pragramie ŭ kožnym kantekście, pakul pracuje GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3004,94 +3481,109 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Zaŭvaha: Padobna na toje, što dziejny  vypusk X.Org XServer maje niepracazdolnaje pašyreńnie RECORD. Klavišnyja skaroty GoldenDict mahčyma rabić nia budutь. Heta treba vypraŭlać na baku serveru. Padrabiaznaja infarmacyja &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tut&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;. Pry žadańni tam možna pakinuć svoj kamentar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Aŭdyjo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Vymaŭleńnie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Aŭtamatyčna vymaŭlać słovy ŭ hałoŭnym aknie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Aŭtamatyčna vymaŭlać słovy ŭ vypłyŭnym aknie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Prajhravańnie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Prajhravać huki praz FFmpeg(libav) i libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Karystać ubudavany prajhravalnik</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Skarystać vonkavuju pragramu dla prajhravańnia aŭdyjo fajłaŭ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Prajhravać praz vonkavuju pragramu:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Sietka</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Ułučyć, kab vykarystoŭvać proksi server
 dla ŭsich sietkavych zapytaŭ pragramy.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Skarystać proksi-server</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Karystalnik:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Parol:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3100,12 +3592,12 @@
 Kali niejkija sajty złamajucca, pasprabuj adłučyć hetuju opcyju.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Abmiežavać załadoŭvanaje źmieściva ź inšych sajtaŭ (chavaje bolšaść reklamy)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3114,24 +3606,24 @@
 Ubudovy musiać być ustalavanymi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Ułučyć sieciŭnyja ŭbudovy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Niekatoryja sajty paznajuć GoldenDict praz HTTP-zahałoŭki
 i blakujuć zapyty. Ułučy opcyju, kab abminuć prablemu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Nie paznačać GoldenDict u HTTP-zapytach</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3143,22 +3635,42 @@
 j prapanuje naviedać bačynu zładavańnia.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Praviarać najaŭnaść novych vypuskaŭ pragramy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Dadatkova</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Dadatkovyja mechanizmy skanavańnia słovaŭ dla vypłyŭnych voknaŭ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3169,12 +3681,12 @@
 Nia treba ŭłučać hetaje opcyi, kali nie karystaješsia takimi pragramami.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Skarystać &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3183,12 +3695,12 @@
 Nia treba ŭłučać hetaje opcyi, kali nie karystaješsia takimi pragramami.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Skarystać &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3197,127 +3709,128 @@
 Nia treba ŭłučać hetaje opcyi, kali nie karystaješsia takimi pragramami.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Skarystać zapyty &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historyja</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Ułučy hetuju opcyju, kab zachoŭvać historyju pierakładanych słovaŭ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Zachoŭvać &amp;historyju</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Paznačaje maksymalnuju kolkaść zapisaŭ u historyi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Pamier historyi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervał zachavańnia historyi. Kali 0, historyja budzie zachoŭvacca tolki pierad vychadam.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Zachoŭvać praz</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>chv</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artykuły</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Ułučy hetuju opcyju, kab zaŭsiody razhortvać dadatkovyja raździeły artykułaŭ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Razhortvać dadatkovyja &amp;raździeły</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Ułučy opcyju, kab aŭtamatyčna zhartać vialikija artykuły</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Zhartać artykuły, jakija majuć bolš za</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Artykuły bolšyja za heta značeńnie buduć zhartacca</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>znakaŭ</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Systemnaja</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Standartny</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Sučasny</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Źmiena movy</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Pierastartuj pragramu, kab užyć novuju movu.</translation>
     </message>
@@ -3325,27 +3838,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Aŭdyjo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Zvyčajny tekst</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Pavodle prefiksu</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Niaviedama</translation>
     </message>
@@ -3371,27 +3884,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Ułučana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nazva</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Zahadny radok</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Značak</translation>
     </message>
@@ -3399,12 +3912,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Pamyłka ładavańnia artykuła</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Pamyłka raskadoŭvańnia artykuła</translation>
     </message>
@@ -3515,18 +4030,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ABMYŁA: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Pamyłka zachavańnia resursu: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Nia vyjšła zładavać paznačanaha resursu.</translation>
     </message>
@@ -3534,12 +4049,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Systema łacinizacyi Hepbiorna dla Chiragany</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Systema łacinizacyi Hepbiorna dla Katakany</translation>
     </message>
@@ -3560,59 +4075,59 @@
         <translation>Dyjalog</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Nazad</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Napierad</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Vymavić słova (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Dasłać słova u hałoŭnaje akno (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Pakazać abo schavać słoŭnikavuju palicu</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Skarystaj špilku, kab zamacavać akno na ekranie, źmianiać
 jahony pamier, dy kiravać im kožnym zručnym sposabam.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3620,17 +4135,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Šlach</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nazva</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Značak</translation>
     </message>
@@ -3652,7 +4167,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Dadać...</translation>
     </message>
@@ -3661,7 +4177,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Prybrać</translation>
     </message>
@@ -3737,39 +4254,39 @@
         <translation>Roznyja sajty. %GDWORD% zamienicca na zapytanaje słova:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Pragramy</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Žyvoje vymaŭleńnie z &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Hety sajt dazvalaje ludziam zapisvać i dzialicca vymaŭleńniem słovaŭ. Ich možna prasłuchać pry dapamozie GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Ułučyć vymaŭleńnie z Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Kluč API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
         <translation>Karystańnie sajtam Forvo patrabuje kluč API. Pakiń pole pustym, kab karystacca standartnym klučom, jaki paźniej moža stać niedastupnym, ci zaregistrujsia na sajcie i atrymaj ułasny kluč.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Atrymaj svoj ułasny kluč &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;tut&lt;/a&gt;, ci pakiń pole pustym dla standartnaha značeńnia.</translation>
     </message>
@@ -3781,79 +4298,89 @@
 dla Big-5, %GDBIG5HKSCS% dla Big5-HKSCS, %GDGBK% dla GBK i GB18030, %GDSHIFTJIS% dla Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Roznyja vonkavyja pragramy. %GDWORD% zamienicca na zapytanaje słova. Kali takoha słova niama, to jaho nakirujuć u standartny ŭvod.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Moŭnyja kody (praz kosku):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Pieralik vybranych moŭnyk kodaŭ. Prykładam: „en, uk, pl“.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Poŭny śpis dastupnych moŭnych kodaŭ &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;tut&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Tranśliteracyja</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Rasiejskaja tranśliteracyja</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Hreckaja tranśliteracyja</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Niamieckaja tranśliteracyja</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Biełaruskaja tranśliteracyja</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Ułučaje łacinski alfabet dla japonskaje movy</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonski ramadzi</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Systemy:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Najbolš užyvany metad transkrypcyi japonskaje movy
 na padstavie angielskaje fanalogii</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepbiorn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3864,12 +4391,12 @@
 U GoldenDict jašče nie padtrymlivajecca.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nichon-siki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3880,75 +4407,77 @@
 U GoldenDict jašče nie padtrymlivajecca.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrej-siki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Składovyja abecedy:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Składovaja abeceda Chiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Chiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Składovaja abeceda Kitakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Syntez movy</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(nie dastupna ŭ pieranosnaj versii)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Vybar katalogu</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Paćvierdžańnie vydaleńnia</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Prybrać katalog &lt;b&gt;%1&lt;/b&gt; sa śpisu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Prybrać sajt &lt;b&gt;%1&lt;/b&gt; sa śpisu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Prybrać pragramu &lt;b&gt;%1&lt;/b&gt; sa śpisu?</translation>
     </message>
@@ -4078,22 +4607,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Ułučany</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nazva</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adras</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Značak</translation>
     </message>
@@ -4101,7 +4630,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Pamyłka zapytu ŭ niejkich słoŭnikach.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/be_BY.ts goldendict-1.5.0~git20150923/locale/be_BY.ts
--- goldendict-1.5.0~git20131003/locale/be_BY.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/be_BY.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Няведамая]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>На падставе Qt %1 (%2, %3 біты)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Разгарнуць артыкул</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Згарнуць артыкул</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>GoldenDict не знайшоў перакладу для &lt;b&gt;%1&lt;/b&gt; у ґрупе &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>GoldenDict не знайшоў перакладу ў ґрупе &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Вітаем!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Вітаем у &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Перш за ўсё наведай &lt;b&gt;Зьмены|Слоўнікі&lt;/b&gt;, каб пазначыць шляхі да слоўнікавых файлаў, зь якіх будзе станавіцца бібліятэка слоўнікаў, дадай розныя сайты Вікіпэдыі й іншыя крыніцы, вызначы парадак слоўнікаў ды ствары слоўнікавыя ґрупы.&lt;p&gt;Па наладжваньні праґрама будзе гатовая да прагляду слоўнікавых артыкулаў. Тое можна рабіць у гэтым акне (упішы шуканае слова ў радок шуканьня) ці ў вонкавых праґрамах з дапамогаю &lt;a href=&quot;Карыстаньне слоўнікам у вонкавых праґрамах&quot;&gt;выплыўных вокнаў&lt;/a&gt;. &lt;p&gt;Каб дапасаваць да сябе праґраму, скарыстай даступныя налады ў &lt;b&gt;Зьменах|Наладах&lt;/b&gt;. Усе зьмешчаныя там налады маюць падказкі. Чытай іх для пэўнасьці ў зробленых зьменах.&lt;p&gt;Калі ўзьніклі пытаньні, прапановы, ці проста захацелася знаць меркаваньні людзей, то запрашаем на наш &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;форум&lt;/a&gt;.&lt;p&gt;Новыя вэрсіі праґрамы заўсёды можна знайсьці на нашым &lt;a href=&quot;http://goldendict.org/&quot;&gt;сайце&lt;/a&gt;.&lt;p&gt;(c) 2008-2013 Канстанцін Ісакаў. Ліцэнзія GPLv3 ці пазьнейшая.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Карыстаньне слоўнікам у вонкавых праґрамах</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Карыстаньне слоўнікам у вонкавых праґрамах&lt;/h3&gt;Каб шукаць словы ў слоўніку з-пад іншых праґрамаў, трэба падлучыць &lt;i&gt;мэханізм выплыўных вокнаў&lt;/i&gt; у &lt;b&gt;Наладах&lt;/b&gt;, і заціснуць кнопку „Выплыўныя вокны“ ў галоўным акне, ці ўлучыць адпаведны пункт кантэкстнага мэню значка ў сыстэмным лотку. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Затым у кожнай праґраме проста спыні курсор мышы над словам, і праз хвілю зьявіцца выплыўное акно з адпаведным артыкулам.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Затым у кожнай праґраме проста абяры слова мышшу (двойчы пстрыкні ці правядзі па слове курсорам мышы з заціснутай левай кнопкай), і праз хвілю зьявіцца выплыўное акно з адпаведным артыкулам.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(неназваная)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(відарыс)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Разгарнуць артыкул</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>З </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Згарнуць артыкул</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Памылка запыту: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Падобныя словы: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Словазлучэньні: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Словы паасобку: </translation>
     </message>
@@ -148,219 +148,222 @@
         <translation>Хорма</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Шукаць:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Папярэдні</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Наступны</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Пазначыць &amp;усе</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Розьніць рэґістар</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Выбраць дзейны артыкул</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Скапіяваць як тэкст</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Інспэктар</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Рэсурс</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Аўдыё</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Сынтэзатар голасу</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Відарыс</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Відэа</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Відэа: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Азначэньне з слоўніка „%1“: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Азначэньне: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Запытанага рэсурсу не існуе.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Пазначанай праґрамы не існуе.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ПАМЫЛКА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Захаваньне гуку</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Гукавыя файлы (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Усе файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Захаваньне выявы</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Файлы выяваў (*.bmp *.jpg *.png *.tif);;Усе файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Адчыніць спасылку</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Ачыніць спасылку ў новай &amp;укладцы</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Адчыніць спасылку ў &amp;вонкавым аглядальніку</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Захаваць &amp;выяву...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Захаваць &amp;гук...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Шукаць „%1“</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Шукаць „%1“ у &amp;новай укладцы</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Зьмясьціць „%1“ у ўводным радку</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Дадаць „%1“ да гісторыі</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Шукаць „%1“ у ґрупе %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Шукаць „%1“ у ґрупе %2 у новай у&amp;кладцы</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>ПАПЯРЭДЖАНЬНЕ: Прайгравальнік FFMpeg: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>УВАГА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Ня здолеў запусьціць прайгравальніка гукавага файла: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Ня здолеў стварыць часовага файла.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Ня здолеў аўтаматычна адчыніць рэсурсавага файла. Паспрабуй адчыніць ручна %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Ня здолеў зладаваць пазначанага рэсурсу.</translation>
     </message>
@@ -386,6 +389,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Пароль:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -486,6 +512,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Тэкставыя файлы (*.txt);;Усе файлы (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Скасаваць</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -528,6 +667,16 @@
         <translation>Апісаньне:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -543,6 +692,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Назва</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Адрас</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Значак</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -560,17 +777,22 @@
         <translation>Рэдаґаваць гэтую ґрупу</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Інфармацыя пра слоўнік</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Адчыніць слоўнікавы каталёґ</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Рэдаґаваць слоўнік</translation>
     </message>
@@ -583,39 +805,39 @@
         <translation>Слоўнікі</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Крыніцы</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Слоўнікі</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>Ґ&amp;рупы</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Крыніцы зьмяніліся</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Колькі крыніц зьмянілася. Ці ўжыць зьмены?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Ужыць</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Скасаваць</translation>
     </message>
@@ -629,6 +851,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Няма</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Няма</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -667,6 +975,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Скасаваць</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -797,7 +1164,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Выдаліць усе ґрупы</translation>
     </message>
@@ -807,42 +1174,100 @@
         <translation>Перацягвай слоўнікі ў/з ґрупы. Разьмяркоўвай іх у ґрупе з дапамогаю мышы.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Дадаць ґрупу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Задай назву новай ґрупы:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Пераназваньне ґрупы</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Задай новую назву ґрупы:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Выдаленьне ґрупы</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Сапраўды жадаеш выдаліць ґрупу &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Сапраўды жадаеш выдаліць усе ґрупы?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Наперад</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Павялічыць</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Паменшыць</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Звычайны памер</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -873,12 +1298,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Артаґрафічныя падказкі: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Марфалёґія %1</translation>
     </message>
@@ -886,12 +1311,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Улучана</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
@@ -1931,7 +2356,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Памылка пры ладаваньні слоўнікаў</translation>
     </message>
@@ -1939,7 +2364,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Абмылка ў файле канфіґурацыі. Працягнуць з стандартнымі наладамі?</translation>
     </message>
@@ -1948,534 +2373,575 @@
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Вітаем!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>Зь&amp;мены</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Дапамога</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Выгляд</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Сумер</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Гісторыя</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Панэль &amp;шуканьня</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Панэль &amp;навіґацыі ў выніках</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Панэль &amp;гісторыі</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Слоўнікі...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Налады...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Хатняя бачына</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Інфармацыя</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Інфармацыя пра GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выйсьці</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Выйсьці з праґрамы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Форум</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>Зьвінуць у &amp;лотак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Зьвінуць акно ў лотак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Захаваць артыкул</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Захаваць артыкул</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>На&amp;друкаваць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Налады &amp;бачыны</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Перадпр&amp;агляд друку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Пера&amp;сканаваць файлы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Ачысьціць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Новая ўкладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Тэчка &amp;канфіґурацыі</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Паказаць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>З&amp;экспартаваць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>З&amp;ымпартаваць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Заўсёды на &amp;версе</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Заўсёды на версе</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Кнопка мэню</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Паказваць &amp;назвы ў слоўнікавай паліцы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Паказваць малыя значкі ў паліцы &amp;прыладаў</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Паліца &amp;мэню</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Навіґацыя</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Наперад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Улучыць працу ў вонкавых праґрамах</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Вымавіць слова (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Павялічыць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Паменшыць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Звычайны памер</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Шукаць у:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Знойдзена ў наступных слоўніках:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Павялічыць радок шуканьня</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Паменшыць радок шуканьня</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Звычайны памер радка шуканьня</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Паказаць &amp;галоўнае акно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Адчыненыя ўкладкі</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Зачыніць дзейную ўкладку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Зачыніць усе ўкладкі</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Зачыніць усе ўкладкі апроч дзейнай</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Ладаваньне...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Новая ўкладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 слоўнікаў, %2 артыкулаў, %3 словаў</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Шукаць:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Усе</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Адчыніць сьпіс укладак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(бяз назвы)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Памылка ініцыялізацыі цікаваньня клявішных скаротаў.&lt;br&gt;Пераканайся, што XServer мае ўлучанае пашырэньне RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Дастуны новы выпуск</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>GoldenDict вэрсіі &lt;b&gt;%1&lt;/b&gt; даступны для заладаваньня.&lt;br&gt;Пстрыкні па &lt;b&gt;Зладаваць&lt;/b&gt;, каб перайсьці на бачыну сьцягваньня.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Зладаваць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Прамінуць гэты выпуск</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Accessibility API ня ўлучаны</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Паліца мэню ёсьць схаваная. Скарыстай %1, каб павараціць назад.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Налады бачыны</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Няма дасяжных друкарак. Спачатку ўсталюй хоць адну.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Надрукаваць артыкул</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Артыкул цалком (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Артыкул, толькі HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Захаваць артыкул як</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Памылка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Няможна захаваць артыкул: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Захоўваньне артыкула...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Галоўнае акно цяпер заўсёды знаходзіцца вышэй іншых.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>С&amp;хаваць</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Экспартаваньне гісторыі ў файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Тэкставыя файлы (*.txt);;Усе файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Экспартаваньне гісторыі кончылася</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Памылка экспарту: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Імпартаваньне гісторыі з файла</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Памылка імпартаваньня: хібныя зьвесткі ў файле</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Імпартаваньне гісторыі кончылася</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Памылка імпартаваньня: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Інфармацыя пра слоўнік</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Адчыніць слоўнікавы каталёґ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Рэдаґаваць слоўнік</translation>
     </message>
@@ -2483,12 +2949,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Слоўнікавы файл скажоны ці пашкоджаны</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Абмылка ладаваньня артыкула з %1, з прычыны: %2</translation>
     </message>
@@ -2496,7 +2962,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Памылка разбору файла XML: %1 — радок %2, слупок %3</translation>
     </message>
@@ -2504,7 +2970,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Памылка разбору файла XML: %1 — радок %2, слупок %3</translation>
     </message>
@@ -2512,22 +2978,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Улучаны</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Адрас</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Значак</translation>
     </message>
@@ -2540,88 +3006,94 @@
         <translation>Хорма</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Парадак слоўнікаў:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Неўжываныя (вылучаныя) слоўнікі:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Інфармацыя пра слоўнік</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Назва:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Усяго артыкулаў:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Усяго словаў:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Крынічная мова:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Мэтавая мова:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Апісаньне:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Файлы, якія складаюць слоўнік:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Упарадкуй слоўнікі, разьмеркаваўшы іх мышшу. Каб не ўжываць слоўніка, перацягні яго ў ґрупу вылучаных слоўнікаў.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Сартаваць паводле назвы</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Сартаваць паводле мовы</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Шлях</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Рэкурсіўна</translation>
     </message>
@@ -2779,22 +3251,27 @@
         <translation>Дадатковы стыль:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Настаў гэтае значэньне, каб унікаць вялікіх мэнюшак.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Граніца колькасьці слоўнікаў у выпадным мэню:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Карыстаньне звонку</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2805,134 +3282,134 @@
 акна ў галоўным акне ці ў сыстэмным лотку.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Улучыць мэханізм выплыўных вокнаў</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Вызначае ці ўлучаць вонкавыя выплыўныя вокны пры стартаваньні праґрамы.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Стартаваць разам з улучанымі выплыўнымі вокнамі</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Паказваць выплыўное акно толькі тады, калі карыстальнік зацісьне ўсе пазначаныя клявішы.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Паказваць выплыўное акно толькі пры наступных заціснутых клявішах:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Толькі левы Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Левы Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Толькі правы Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Правы Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Клявіш Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Клявіш Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Толькі левы Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Левы Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Клявіш Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Толькі правы Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Правы Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Толькі правы Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Правы Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Толькі левы Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Левы Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows-клявіш ці Meta-клявіш</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2943,12 +3420,12 @@
 і праз пэўны час.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Клявішы можна націснуць і праз</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2956,42 +3433,42 @@
 абмежаваную колькасьць сэкундаў, якая й задаецца тут.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>с</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Слаць перакладанае слова ў галоўнае акно замест выкліканьня выплыўнога</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Слаць перакладанае слова ў галоўнае акно</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Клявішныя скароты</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Выкарыстоўваць наступны скарот для выкліканьня галоўнага акна:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Выкарыстоўваць наступны скарот для перакладу слова з кішэні:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Клявішныя скароты ёсьць ґлябальнымі і дзейнічаюць у кожнай праґраме ў кожным кантэксьце, пакуль працуе GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3004,94 +3481,109 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Заўвага: Падобна на тое, што дзейны  выпуск X.Org XServer мае непрацаздольнае пашырэньне RECORD. Клявішныя скароты GoldenDict магчыма рабіць ня будуть. Гэта трэба выпраўляць на баку сэрвэру. Падрабязная інфармацыя &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;тут&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;. Пры жаданьні там можна пакінуць свой камэнтар.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аўдыё</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Вымаўленьне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Аўтаматычна вымаўляць словы ў галоўным акне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Аўтаматычна вымаўляць словы ў выплыўным акне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Прайграваньне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Прайграваць гукі праз FFmpeg(libav) і libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Карыстаць убудаваны прайгравальнік</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Скарыстаць вонкавую праґраму для прайграваньня аўдыё файлаў</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Прайграваць праз вонкавую праґраму:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Сетка</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Улучыць, каб выкарыстоўваць проксі сэрвэр
 для ўсіх сеткавых запытаў праґрамы.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Скарыстаць проксі-сэрвэр</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Тып:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Гост:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Карыстальнік:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3100,12 +3592,12 @@
 Калі нейкія сайты зламаюцца, паспрабуй адлучыць гэтую опцыю.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Абмежаваць заладоўванае зьмесьціва зь іншых сайтаў (хавае большасьць рэклямы)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3114,24 +3606,24 @@
 Убудовы мусяць быць усталяванымі.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Улучыць сеціўныя ўбудовы</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Некаторыя сайты пазнаюць GoldenDict праз HTTP-загалоўкі
 і блякуюць запыты. Улучы опцыю, каб абмінуць праблему.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Не пазначаць GoldenDict у HTTP-запытах</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3143,22 +3635,42 @@
 й прапануе наведаць бачыну зладаваньня.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Правяраць наяўнасьць новых выпускаў праґрамы</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Дадаткова</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Дадатковыя мэханізмы сканаваньня словаў для выплыўных вокнаў</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3169,12 +3681,12 @@
 Ня трэба ўлучаць гэтае опцыі, калі не карыстаешся такімі праґрамамі.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Скарыстаць &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3183,12 +3695,12 @@
 Ня трэба ўлучаць гэтае опцыі, калі не карыстаешся такімі праґрамамі.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Скарыстаць &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3197,127 +3709,128 @@
 Ня трэба ўлучаць гэтае опцыі, калі не карыстаешся такімі праґрамамі.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Скарыстаць запыты &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Гісторыя</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Улучы гэтую опцыю, каб захоўваць гісторыю перакладаных словаў</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Захоўваць &amp;гісторыю</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Пазначае максымальную колькасьць запісаў у гісторыі.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Памер гісторыі:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Інтэрвал захаваньня гісторыі. Калі 0, гісторыя будзе захоўвацца толькі перад выхадам.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Захоўваць праз</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>хв</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Артыкулы</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Улучы гэтую опцыю, каб заўсёды разгортваць дадатковыя разьдзелы артыкулаў</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Разгортваць дадатковыя &amp;разьдзелы</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Улучы опцыю, каб аўтаматычна згартаць вялікія артыкулы</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Згартаць артыкулы, якія маюць больш за</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Артыкулы большыя за гэта значэньне будуць згартацца</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>знакаў</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Сыстэмная</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Стандартны</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Сучасны</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Зьмена мовы</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Перастартуй праґраму, каб ужыць новую мову.</translation>
     </message>
@@ -3325,27 +3838,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Аўдыё</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Звычайны тэкст</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Паводле прэфіксу</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Няведама</translation>
     </message>
@@ -3371,27 +3884,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Улучана</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Тып</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Загадны радок</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Значак</translation>
     </message>
@@ -3399,12 +3912,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Памылка ладаваньня артыкула</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Памылка раскадоўваньня артыкула</translation>
     </message>
@@ -3515,18 +4030,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>АБМЫЛА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Памылка захаваньня рэсурсу: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Ня выйшла зладаваць пазначанага рэсурсу.</translation>
     </message>
@@ -3534,12 +4049,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Сыстэма лацінізацыі Гэпбёрна для Хіраґаны</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Сыстэма лацінізацыі Гэпбёрна для Катаканы</translation>
     </message>
@@ -3560,59 +4075,59 @@
         <translation>Дыялёґ</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Наперад</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Вымавіць слова (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Даслаць слова у галоўнае акно (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Паказаць або схаваць слоўнікавую паліцу</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Скарыстай шпільку, каб замацаваць акно на экране, зьмяняць
 ягоны памер, ды кіраваць ім кожным зручным спосабам.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3620,17 +4135,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Шлях</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Значак</translation>
     </message>
@@ -3652,7 +4167,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Дадаць...</translation>
     </message>
@@ -3661,7 +4177,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Прыбраць</translation>
     </message>
@@ -3737,39 +4254,39 @@
         <translation>Розныя сайты. %GDWORD% заменіцца на запытанае слова:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Праґрамы</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Жывое вымаўленьне з &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Гэты сайт дазваляе людзям запісваць і дзяліцца вымаўленьнем словаў. Іх можна праслухаць пры дапамозе GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Улучыць вымаўленьне з Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Ключ API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
         <translation>Карыстаньне сайтам Forvo патрабуе ключ API. Пакінь поле пустым, каб карыстацца стандартным ключом, які пазьней можа стаць недаступным, ці зарэґіструйся на сайце і атрымай уласны ключ.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Атрымай свой уласны ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;тут&lt;/a&gt;, ці пакінь поле пустым для стандартнага значэньня.</translation>
     </message>
@@ -3781,79 +4298,89 @@
 для Big-5, %GDBIG5HKSCS% для Big5-HKSCS, %GDGBK% для GBK і GB18030, %GDSHIFTJIS% для Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Розныя вонкавыя праґрамы. %GDWORD% заменіцца на запытанае слова. Калі такога слова няма, то яго накіруюць у стандартны ўвод.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Моўныя коды (праз коску):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Пералік выбраных моўнык кодаў. Прыкладам: „en, uk, pl“.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Поўны сьпіс даступных моўных кодаў &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;тут&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Трансьлітэрацыя</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Расейская трансьлітэрацыя</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Грэцкая трансьлітэрацыя</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Нямецкая трансьлітэрацыя</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Беларуская трансьлітэрацыя</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Улучае лацінскі альфабэт для японскае мовы</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Японскі рамадзі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Сыстэмы:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Найбольш ужываны мэтад транскрыпцыі японскае мовы
 на падставе анґельскае фаналёґіі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Гэпбёрн</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3864,12 +4391,12 @@
 У GoldenDict яшчэ не падтрымліваецца.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Ніхон-сікі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3880,75 +4407,77 @@
 У GoldenDict яшчэ не падтрымліваецца.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Кунрэй-сікі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Складовыя абэцэды:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Складовая абэцэда Хіраґана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Хіраґана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Складовая абэцэда Кітакана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Катакана</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Сынтэз мовы</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(не даступна ў пераноснай вэрсіі)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Выбар каталёґу</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Пацьверджаньне выдаленьня</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Прыбраць каталёґ &lt;b&gt;%1&lt;/b&gt; са сьпісу?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Прыбраць сайт &lt;b&gt;%1&lt;/b&gt; са сьпісу?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Прыбраць праґраму &lt;b&gt;%1&lt;/b&gt; са сьпісу?</translation>
     </message>
@@ -4078,22 +4607,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Улучаны</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Адрас</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Значак</translation>
     </message>
@@ -4101,7 +4630,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Памылка запыту ў нейкіх слоўніках.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/bg_BG.ts goldendict-1.5.0~git20150923/locale/bg_BG.ts
--- goldendict-1.5.0~git20131003/locale/bg_BG.ts	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/bg_BG.ts	2015-09-23 08:26:24.000000000 +0000
@@ -326,6 +326,25 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished">Парола:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <source>Form</source>
@@ -404,6 +423,97 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отхвърляне</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <source>Total articles:</source>
@@ -442,6 +552,14 @@
 %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DictListModel</name>
@@ -451,6 +569,62 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished">Включено</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Име</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">Адрес</translation>
+    </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -480,6 +654,10 @@
         <source>Extended menu with all dictionaries...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditDictionaries</name>
@@ -524,6 +702,75 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Без</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Без</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <source>XML parse error: %1 at %2,%3</source>
@@ -555,6 +802,53 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отхвърляне</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <source>German Transliteration</source>
@@ -696,6 +990,53 @@
         <source>Auto groups</source>
         <translation>Автоматични групи</translation>
     </message>
+    <message>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Напред</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">Увеличаване</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Намаляване</translation>
+    </message>
+    <message>
+        <source>Normal Size</source>
+        <translation type="unfinished">Нормален размер</translation>
+    </message>
+    <message>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HistoryPaneWidget</name>
@@ -2048,6 +2389,39 @@
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mdx::MdxArticleRequest</name>
@@ -2105,7 +2479,7 @@
     </message>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <source>Inactive (disabled) dictionaries:</source>
@@ -2155,6 +2529,14 @@
         <source>Sort by languages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
@@ -2761,6 +3143,38 @@
         <source>Articles longer than this size will be collapsed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
@@ -3296,6 +3710,14 @@
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StylesComboBox</name>
diff -Nru goldendict-1.5.0~git20131003/locale/cs_CZ.ts goldendict-1.5.0~git20150923/locale/cs_CZ.ts
--- goldendict-1.5.0~git20131003/locale/cs_CZ.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/cs_CZ.ts	2015-09-23 08:26:24.000000000 +0000
@@ -342,6 +342,25 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished">Heslo:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <source>Form</source>
@@ -420,6 +439,97 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Textové soubory (*.txt);;Všechny soubory (*.*)</translation>
+    </message>
+    <message>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušit</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <source>Total articles:</source>
@@ -459,6 +569,14 @@
         <translation>Upravit slovník příkazem:
 %1</translation>
     </message>
+    <message>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DictListModel</name>
@@ -468,6 +586,62 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished">Povoleno</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">Adresa</translation>
+    </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished">Ikona</translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -497,6 +671,10 @@
         <source>Extended menu with all dictionaries...</source>
         <translation>Rozšířit nabídku se všemi slovníky...</translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditDictionaries</name>
@@ -541,6 +719,75 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Žádná</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Žádná</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <source>XML parse error: %1 at %2,%3</source>
@@ -572,6 +819,53 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušit</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <source>German Transliteration</source>
@@ -717,6 +1011,53 @@
         <source>Auto groups</source>
         <translation>Automatické skupiny</translation>
     </message>
+    <message>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Zpět</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Vpřed</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">Přiblížit</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Oddálit</translation>
+    </message>
+    <message>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normální velikost</translation>
+    </message>
+    <message>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HistoryPaneWidget</name>
@@ -2825,6 +3166,39 @@
         <source>Open dictionary folder</source>
         <translation>Otevřít složku slovníků</translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mdx::MdxArticleRequest</name>
@@ -2882,7 +3256,7 @@
     </message>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <source>Inactive (disabled) dictionaries:</source>
@@ -2933,6 +3307,14 @@
         <source>Sort by languages</source>
         <translation>Seřadit podle jazyků</translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
@@ -3577,6 +3959,38 @@
         <source>Articles longer than this size will be collapsed</source>
         <translation>Články delší než tato velikost budou sbaleny</translation>
     </message>
+    <message>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
@@ -4140,6 +4554,14 @@
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Všechny externí programy. Řetězec %GDWORD% bude nahrazen hledaným slovem. Pokud takový řetězec nebude předán, slovo bude posláno na standardní vstup.</translation>
     </message>
+    <message>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StylesComboBox</name>
diff -Nru goldendict-1.5.0~git20131003/locale/de_DE.ts goldendict-1.5.0~git20150923/locale/de_DE.ts
--- goldendict-1.5.0~git20131003/locale/de_DE.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/de_DE.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Unbekannt]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Basiert auf Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,32 +42,32 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Artikel aufklappen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Artikel einklappen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>In &lt;b&gt;%2&lt;/b&gt; wurde kein Eintrag für &lt;b&gt;%1&lt;/b&gt; gefunden.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Kein Eintrag in Gruppe &lt;b&gt;%1&lt;/b&gt; gefunden.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Willkommen!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Willkommen bei &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Damit Sie mit dem Programm beginnen können, besuchen Sie zunächst &lt;b&gt;Bearbeiten » Wörterbücher&lt;/b&gt;, um Pfade zu gespeicherten Wörterbüchern hinzuzufügen, Wikipedia oder andere Seiten einzurichten, oder um die Wörterbücher zu ordnen bzw. um Sie in Gruppen zu unterteilen.&lt;/p&gt;
 &lt;p&gt;Dann sind Sie bereit, um das erste Wort nachzuschlagen! Dies können Sie im Fenster auf der linken Seite, oder &lt;a href=&quot;Mit Popups arbeiten&quot;&gt;mittels der Popup-Funktion in anderen Applikationen.&lt;/a&gt;&lt;/p&gt;
@@ -75,32 +75,32 @@
 &lt;p&gt;Sollten Sie trotzdem noch Hilfe brauchen, oder wenn Sie sonstige Fragen und Verbesserungsvorschlage haben, oder wenn Sie nur wissen wollen, was andere denken, dann finden Sie uns im &lt;a href=&quot;hhttp://goldendict.org/forum/&quot;&gt;Forum&lt;/a&gt;. &lt;p&gt;Programmupdates sind auf der &lt;a href=&quot;http://goldendict.org/&quot;&gt;Website&lt;/a&gt; zu finden.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Lizensiert unter der GPLv3 oder neuer.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Mit Popups arbeiten</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Mit Popups arbeiten&lt;/h3&gt;Um Wörter von anderen aktiven Applikationen nachzuschlagen, muss zunächst die &lt;i&gt;&quot;Scan Popup Funktionalität&quot;&lt;/i&gt; in den &lt;b&gt;Einstellungen&lt;/b&gt; aktiviert, und dann freigeschalten werden. Dies kann zu jeder Zeit über das &apos;Popup&apos;-Symbol in der Werkzeugleiste, oder mittels Kontextmenü des Icons in der Symbolleiste geschehen.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Dann einfach mit der Mauszeiger über das Wort in der Applikation fahren, welches nachgeschlagen werden soll, und ein Fenster wird sichtbar wo es erklärt wird.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Dann einfach ein Wort mit der Maus (Doppelklicken oder bei gedrückten Tasten darüberfahren) markieren, welches nachgeschlagen werden soll. Dann öffnet sich ein Popup, welches das Wort beschreibt.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(unbenannt)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(Bild)</translation>
     </message>
@@ -108,37 +108,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Artikel aufklappen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Artikel einklappen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Abfragefehler: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Ähnliche Wörter: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Zusammengesetzte Treffer:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Einzelne Wörter:</translation>
     </message>
@@ -146,47 +146,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Aktuellen Artikel auswählen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Als Text kopieren</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Betrachten</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Ressource</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS Stimme</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Bild</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definition vom Wörterbuch &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definition: %1</translation>
     </message>
@@ -195,99 +195,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Die angegebene Ressource existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Die angegebene Audioprogramm existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>FEHLER: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Klang speichern</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Audiodateien (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Bild speichern</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Bilder (*.bmp *.jpg *.png *.tif);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Link öffnen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Link in neuem Rei&amp;ter öffnen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Link in &amp;externen Browser öffnen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Schlage &quot;%1&quot; nach</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Schlage &quot;%1&quot; in &amp;neuem Reiter nach</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Sende &quot;%1&quot; an die Eingabezeile</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>Füge &quot;%1&quot;  zum Verlauf &amp;hinzu </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Schlage &quot;%1&quot; in %2 nach</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Schlage &quot;%1&quot; in %2 in &amp;neuem Reiter nach</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>WARNUNG: FFmpeg Audio Player: %1</translation>
     </message>
@@ -300,37 +301,37 @@
         <translation type="obsolete">Um das Abspielen von Dateien anders als WAV zu akivieren, müssen Sie in Bearbeiten » Einstellungen, im Reiter Audio die Option &quot;Mit DirectShow abspielen&quot; auswählen.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Konnte folgende Audiodatei nicht mit dem Player abspielen: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Konnte keine temporäre Datei anlegen.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Konnte die Ressource nicht automatisch öffnen; versuchen Sie es manuell: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Die angegebene Ressource konnte nicht heruntergeladen werden.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Bild &amp;speichern...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>&amp;Klang speichern...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>WARNUNG: %1</translation>
     </message>
@@ -340,42 +341,44 @@
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Suche:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Vorheriger</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Nächster</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Strg+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Groß und Kleinschreibung beachten</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>&amp;Alles hervorheben</translation>
     </message>
@@ -400,6 +403,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Passwort:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -500,6 +526,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Textdateien(*.txt);;All Dateien(*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -542,6 +681,16 @@
         <translation>Beschreibung:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -558,6 +707,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Adresse</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Icon</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -579,17 +796,22 @@
         <translation>Diese Gruppe bearbeiten</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Wörterbuch-Ordner öffnen</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Wörterbuch bearbeiten</translation>
     </message>
@@ -597,39 +819,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Quellen</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Wörterbücher</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Gruppen</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Quellen geändert</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Einige Quellen haben sich geändert. Möchten Sie die Änderungen akzeptieren?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Übernehmen</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -648,6 +870,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -686,6 +994,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -725,43 +1092,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Gruppe hinzufügen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Geben Sie den Namen der neuen Gruppe ein:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Gruppe umbenennen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Geben Sie den neuen Namen der Gruppe ein:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Gruppe entfernen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Möchten Sie wirklich die Gruppe &lt;b&gt;%1&lt;/b&gt; entfernen?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Alle Gruppen entfernen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Wollen Sie wirklich alle Gruppen entfernen?</translation>
     </message>
@@ -862,6 +1239,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Zurück</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Vergrößern</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Verkleinern</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normale Größe</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -892,12 +1317,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Rechtschreibvorschläge:</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 Morphologie</translation>
     </message>
@@ -905,12 +1330,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
@@ -1950,7 +2375,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Fehler beim Laden der Wörterbücher</translation>
     </message>
@@ -1958,7 +2383,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Fehler in der Konfigurationsdatei. Mit Standardeinstellungen fortfahren?</translation>
     </message>
@@ -1970,18 +2395,18 @@
         <translation type="obsolete">Zeige Namen in Wörterbuchleiste</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Menüleiste</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Suche in:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>In Wörterbüchern gefunden:</translation>
     </message>
@@ -1990,226 +2415,237 @@
         <translation type="obsolete">Navigation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Vorwärts</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Scan Popup</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Wort aussprechen (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Vergrößern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Verkleinern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Normale Größe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Suchwörter vergrößern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Suchwörter verkleinern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Suchwörter in normaler Größe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Im &amp;Hauptfenster zeigen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Aktuellen Reiter schließen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Alle Reiter schließen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Alle anderen Reiter schließen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Barrierefreiheit-API ist nicht aktiviert </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artikel, komplett (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artikel, nur HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Artikel wird gespeichert...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Das Hauptfenster ist eingestellt als immer im Vordergrund.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Verbergen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Verlauf in eine Datei exportieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Textdateien(*.txt);;All Dateien(*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Export des Verlaufes abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Exportfehler: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Verlauf von Datei importieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Importfehler: ungültige Daten in Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Import des Verlaufes abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Importfehler: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Wörterbuch-Ordner öffnen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>B&amp;eenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Lade...</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Willkommen!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 Wörterbücher, %2 Artikel, %3 Wörter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Nachschlagen:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Offene Reiter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Namen in &amp;Wörterbuchleiste anzeigen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Kleine Icons in der &amp;Toolbar anzeigen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Liste der Reiter öffnen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(unbenannt)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2222,57 +2658,57 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Der Mechanismus für die Tastenkürzel konnte nicht initialisiert werden.&lt;br&gt;Vergewissern Sie sich, dass der XServer die RECORD Erweiterung aktiviert hat.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Neue Version verfügbar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Version &lt;b&gt;%1&lt;/b&gt; von GoldenDict ist nun zum Herunterladen verfügbar.&lt;br&gt;Klicken Sie auf &lt;b&gt;Herunterladen&lt;/b&gt;, um zur Seite fürs Herunterladen zu gelangen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Diese Version überspringen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Es wurde eingestellt die Menüleiste zu verstecken. Mit %1 kann sie wieder angezeigt werden.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Strg+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Seite einrichten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Es ist kein Drucker vorhanden. Bitte zuerst einen installieren.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Drucke Artikel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Artikel speichern als</translation>
     </message>
@@ -2281,42 +2717,42 @@
         <translation type="obsolete">Html Dateien (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Kann Artikel nicht speichern: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Verlauf</translation>
     </message>
@@ -2325,12 +2761,12 @@
         <translation type="obsolete">Suchformular</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Wörterbücher...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
@@ -2339,148 +2775,178 @@
         <translation type="obsolete">&amp;Gruppen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Suchformular</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Ergebnisliste</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Verlaufsformular</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Webseite</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Über GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Applikation beenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>In die &amp;Symbolleiste schließen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>In the Symbolleiste minimieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Strg+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>Artikel &amp;speichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Artikel speichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Seite einrichten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Druck&amp;vorschau</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Dateien neu ein&amp;lesen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>Neuer Rei&amp;ter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Immer im Vordergrund</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Immer im Vordergrund</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Menüschaltfläche</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Druckvorschau</translation>
     </message>
@@ -2489,48 +2955,48 @@
         <translation type="obsolete">Dateien neu einlesen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Strg+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Neuer Reiter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Strg+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Konfigurationsordner</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Anzeigen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Strg+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
@@ -2538,12 +3004,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Die Wörterbuchdatei war manipuliert oder korrupt</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Konnte den Artikel von %1 nicht laden, Grund: %2</translation>
     </message>
@@ -2551,7 +3017,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Fehler beim XML-parsen: %1 bei %2,%3</translation>
     </message>
@@ -2559,7 +3025,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Fehler beim XML-parsen: %1 bei %2,%3</translation>
     </message>
@@ -2567,22 +3033,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Icon</translation>
     </message>
@@ -2595,88 +3061,94 @@
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Reihenfolge der Wörterbücher:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Inaktive (deaktivierte) Wörterbücher:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informationen über das Wörterbuch</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Artikel insgesamt:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Wörter insgesamt:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Übersetzt von:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Übersetzt nach:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Wörterbuch zusammengesetzt aus diesen Dateien:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Verändern Sie die Reihenfolge mit Drag und Drop.  Lassen sie ein Wörterbuch mittels Drag und Drop in der inaktiven Gruppe fallen, um es zu deaktivieren.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Sortieren nach Name</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Sortieren nach Sprachen</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Pfad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Rekursiv</translation>
     </message>
@@ -2684,37 +3156,38 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Systemvorgabe</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blau</translation>
     </message>
@@ -2723,12 +3196,12 @@
         <translation type="obsolete">Mit DirectShow abspielen</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Sprache ändern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Starten Sie das Programm neu, um den Sprachwechsel abzuschließen.</translation>
     </message>
@@ -2829,12 +3302,12 @@
         <translation>Darstellung:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Scan Popup</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2845,7 +3318,7 @@
 und in der Symbolleiste an- und abgeschaltet werden.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Aktiviert die Scan Popup Funktionalität</translation>
     </message>
@@ -2902,140 +3375,145 @@
         <translation>Add-on style:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Mit der Anpassung dieses Wertes können rießige Kontextmenüs vermieden werden.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Wörterbuchlimit im Kontextmenü:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Gibt an, ob der Scan Popup Modus standardmäßig aktiviert ist oder nicht. Falls aktiviert,
 wird das Programm immer mit aktiviertem Modus gestartet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Mit aktiviertem Scan Popup starten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Fallt aktiviert, wird das Scan Popup bei Änderung der Wortauswahl nur angezeigt, wenn alle ausgewählten Tasten gedrückt sind.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Nur Popup anzeigen, wenn alle ausgewählten Tasten gedrückt werden:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Nur Strg links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Strg links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Nur Umschalttaste rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Umschalttaste rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt-Taste</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Strg-Taste</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Strg</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Nur Alt links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Umschalttaste</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Umschalttaste</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Nur Alt rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Nur Strg rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Strg rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Nur Umschalttaste links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Umschalttaste links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows/Meta-Taste</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3046,37 +3524,72 @@
 Tasten auch kurz nach der Markierung gedrückt werden.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Übersetzte Wörter ans Hauptfenster senden, anstatt sie im Popup-Fenster anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Übersetzte Wörter ans Hauptfenster senden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Wählen Sie diese Option, falls Sie automatisch große Artikel einklappen möchten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Artikel einklappen mit mehr als</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Artikel länger als diese Größe werden eingeklappt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>Symbolen</translation>
     </message>
@@ -3101,27 +3614,27 @@
         <translation type="obsolete">Mit Phonon abspielen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Ein externes Program zum Abspielen der Audiodaten benutzen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Externes Programm benutzen:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Erweitert</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>ScanPopup-Extra-Technologie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3132,12 +3645,12 @@
 Sollte solche Programme nicht verwendet werden, wird diese Option nicht gebraucht.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>&amp;IAccessibleEx verwenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3146,12 +3659,12 @@
 Sollte solche Programme nicht verwendet werden, wird diese Option nicht gebraucht.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>&amp;UIAutomation verwenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3160,72 +3673,72 @@
 Sollte solche Programme nicht verwendet werden, wird diese Option nicht gebraucht.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>&amp;GoldenDict Mitteilung verwenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Aktivieren Sie diese Option, um den Verlauf der übersetzten Wörter zu speichern.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>&amp;Verlauf speichern</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Geben Sie die maximale Anzahl von Einträgen im Verlauf an.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Maximale Verlaufgröße:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervall zum speichern des Verlaufs. Falls 0, wird der Verlauf beim Programmende gespeichert.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Speichern alle</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artikel</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Aktivieren Sie diese Option, um optionale Abschnitte von Artikeln immer zu erweitern.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Optionale &amp;Abschnitte erweitern</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Die Tasten können auch im nachhinein innerhalb von</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3234,32 +3747,32 @@
 Sekunden überwacht, wie hier angegeben.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>Sekunde(n) gedrückt werden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Tastenkürzel</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Das folgende Tastenkürzel benutzen, um das Hauptfenster zu zeigen oder zu verbergen:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Das folgende Tastenkürzel benutzen, um ein Wort von der Zwischenablage zu übersetzen:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Die Tastenkürzel sind global und funktionieren in jedem Programm und Kontext, sofern GoldenDict im Hintergrund läuft.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3272,78 +3785,78 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Achtung: Es scheicht, dass sie eine X.Org-XServer-Version benutzen, welche die RECORD-Erweiterung nicht richtig funktioniert. Deshalb werden Tastenkürzel höchstwahrscheinlich nicht funktionieren. Dies muss am Server selbst korrigiert werden. Dies bezieht sich auf folgenden &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Fehlereintrag&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;, welchen Sie, falls gewünscht, kommentieren können.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Aussprache</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Wörter im Hauptfenster automatisch aussprechen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Wörter im Scan Popup automatisch aussprechen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Audiodateien mit FFmpeg(libav) und libao abspielen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Internen Abspieler verwenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Netzwerk</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Aktivieren, falls ein Proxy-Server für alle Netzverbindungen des Programms verwendet werden soll.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Proxyserver verwenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Benutzer:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3352,12 +3865,12 @@
 nicht mehr funktionieren, kann das Deaktivieren dieser Option helfen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Inhalte nicht von fremden Seiten laden (unterbindet meist Werbung)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3366,24 +3879,24 @@
 Ein Plugin muss für diese Option installiert sein.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Webplugins aktivieren</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Einige Seiten erkennen GoldenDict mittels HTTP-Kopfzeilen und blockieren die Anfrage.
 Diese Option kann dieses Problem beheben.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>GoldenDict nicht in HTTP-Kopfzeilen identifizieren</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3395,7 +3908,7 @@
 Download-Seite.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Periodisch auf neue Programmversionen prüfen</translation>
     </message>
@@ -3403,27 +3916,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Klartext</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Präfixtreffer</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -3449,27 +3962,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Kommandozeile</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Icon</translation>
     </message>
@@ -3477,12 +3990,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Fehler beim Laden des Artikels</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Fehler beim Dekodieren des Artikels</translation>
     </message>
@@ -3593,18 +4108,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>FEHLER: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Fehler beim speichern der Ressource: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Die Ressource konnte nicht heruntergeladen werden.</translation>
     </message>
@@ -3612,12 +4127,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji für Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji für Katakana</translation>
     </message>
@@ -3646,21 +4161,21 @@
         <translation type="obsolete">Treffer anzeigen (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Weiter</translation>
     </message>
@@ -3669,32 +4184,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Wort aussprechen (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Wort an das Hauptfenster senden (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Zeigt oder versteckt die Wörterbuchleiste</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Hiermit kann das Fenster fixiert  werden, damit es am Bildschirm bleibt,
@@ -3705,8 +4220,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3714,17 +4229,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Pfad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Icon</translation>
     </message>
@@ -3732,45 +4247,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Sprachausgabe</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(nicht in der portablen Version)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Verzeichnis auswählen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Löschung bestätigen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Soll das Verzeichnis &lt;b&gt;%1&lt;/b&gt; von der Liste entfernt werden?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Soll die Seite &lt;b&gt;%1&lt;/b&gt; von der Liste entfernt werden?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Soll das Programm &lt;b&gt;%1&lt;/b&gt; von der Liste entfernt werden?</translation>
     </message>
@@ -3789,7 +4306,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Hinzufügen...</translation>
     </message>
@@ -3798,7 +4316,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Entfernen</translation>
     </message>
@@ -3878,32 +4397,32 @@
         <translation type="obsolete">Alternativ kann %GD1251% für CP1251 und %GDISO1% für ISO 8859-1 benutzt werden.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programme</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Aussprachen live von &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Diese Seite erlaubt es Menschen Aussprachen von Wörter aufzunehmen und zu teilen. Diese können in GoldenDict angehört werden.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Aussprachen von Forvo aktivieren</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API Schlüssel:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3912,7 +4431,7 @@
 wird. Sie können sich auch auf der Seite registrieren, um ihren eigenen Schlüssel zu erhalten.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Holen Sie sich &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;hier&lt;/a&gt; den eigenen Schlüssel, oder lassen Sie das Feld leer um den Standardschlüssel zu verwenden.</translation>
     </message>
@@ -3942,79 +4461,89 @@
 %GDBIG5% für Big-5, %GDBIG5HKSCS% für Big5-HKSCS, %GDGBK% für GBK und GB18030, %GDSHIFTJIS% für Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Irgendwelche externe Programme. Der String %GDWORD% wird mit dem Suchwort ersetzt. Falls eine solche Zeichenkette nicht vorhanden ist, wird das Wort an die Standardeingabe geschickt.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Sprachkodes (mit Beistrich getrennt):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Die Liste der Sprachkodes, welche Sie benutzen möchten. Zum Beispiel &quot;de, en&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Die vollständige Liste der Sprachkodes ist &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;hier&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteration</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Russische Transliteration</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Griechische Transliteration</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Deutsche Transliteration</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Weißrussische Transliteration</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Aktiviert das Verwenden des Lateinischen Alphabetes zum Schreiben der Japanischen Sprache</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japanisch Rōmaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Systeme:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Die weitverbreiteste Methode zur Transkription vom Japanischen,
 basierend auf der Englischen Aussprache</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4025,12 +4554,12 @@
 Noch nicht in GoldenDict implementiert.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nippon</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4041,32 +4570,32 @@
 Noch nicht in GoldenDict implementiert.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Silbenschriften:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Japanische Hiragana Silbenschrift</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Japanische Katakana Silbenschrift</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4196,22 +4725,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Icon</translation>
     </message>
@@ -4219,7 +4748,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Einige Wörterbücher konnten nicht befragt werden.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/el_GR.ts goldendict-1.5.0~git20150923/locale/el_GR.ts
--- goldendict-1.5.0~git20131003/locale/el_GR.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/el_GR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -45,70 +45,70 @@
         <translation>[Άγνωστο]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Βασίζεται στην Qt %1 (%2, %3 bit)</translation>
     </message>
 </context>
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>Εμφάνιση άρθρου</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>Απόκρυψη άρθρου</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Δε βρέθηκε μετάφραση του &lt;b&gt;%1&lt;/b&gt; στην ομάδα &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Δε βρέθηκαν μεταφράσεις στην ομάδα &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Καλώς ήλθατε!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Καλώς ήλθατε στο &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Για να ξεκινήσετε, επιλέξτε &lt;b&gt;Επεξεργασία|Λεξικά&lt;/b&gt;. Από εδώ μπορείτε να προσθέσετε φακέλους που περιέχουν λεξικά, να ενεργοποιήσετε την αναζήτηση στη Βικιπαίδεια ή άλλες πηγές, να αλλάξετε τη σειρά των λεξικών ή να δημιουργήσετε ομάδες λεξικών.&lt;p&gt;Μετά θα είστε έτοιμοι να ξεκινήσετε την αναζήτηση! Μπορείτε να αναζητάτε λέξεις από την αριστερή στήλη αυτού του παραθύρου, ή από &lt;a href=&quot;Χρήση αναδυόμενου παραθύρου&quot;&gt;οποιαδήποτε άλλη ανοιχτή εφαρμογή&lt;/a&gt;.&lt;p&gt;Για να προσαρμόσετε το πρόγραμμα στις απαιτήσεις σας, δείτε τις διαθέσιμες ρυθμίσεις στο μενού &lt;b&gt;Επεξεργασία|Προτιμήσεις&lt;/b&gt;. Όλες οι προτιμήσεις διαθέτουν χρήσιμες συμβουλές οθόνης, που μπορείτε να διαβάσετε τοποθετώντας το ποντίκι σας πάνω στην αντίστοιχη προτίμηση.&lt;p&gt;Για περαιτέρω βοήθεια, ερωτήματα, υποδείξεις, ή απλά για να διαβάσετε τις γνώμες άλλων χρηστών, μπορείτε να εγγραφείτε στο &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;φόρουμ&lt;/a&gt; του προγράμματος. &lt;p&gt;Ενημερώσεις μπορείτε να βρείτε στον &lt;a href=&quot;http://goldendict.org/&quot;&gt;ιστότοπο&lt;/a&gt; του προγράμματος.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Διανέμεται υπό τους όρους της GNU GPLv3 ή νεότερης έκδοσής της.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Χρήση αναδυόμενου παραθύρου</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Χρήση αναδυόμενου παραθύρου&lt;/h3&gt; Για να μπορείτε να αναζητάτε λέξεις που συναντήσατε σε άλλες ενεργές εφαρμογές, πρέπει πρώτα να ενεργοποιήσετε τη &lt;i&gt;&quot;Λειτουργία αναδυόμενου παραθύρου&quot;&lt;/i&gt; από τις &lt;b&gt;Προτιμήσεις&lt;/b&gt;. Μετά, θα μπορείτε να την ενεργοποιείτε όποτε θέλετε, είτε πατώντας το εικονίδιο &quot;Αναδυόμενο παράθυρο&quot; της εργαλειοθήκης, είτε κάνοντας δεξί κλικ στο εικονίδιο της περιοχής ειδοποιήσεων και επιλέγοντας την από το μενού.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Στη συνέχεια, θα μπορείτε να τοποθετείτε το δρομέα πάνω στις λέξεις που σας ενδιαφέρουν για να εμφανίζετε ένα παράθυρο με την επεξήγησή τους.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Στη συνέχεια, απλά επιλέξτε με το ποντίκι μια λέξη σε άλλη εφαρμογή (π.χ. με δεξί κλικ πάνω στη λέξη), και θα εμφανιστεί ένα παράθυρο με την επεξήγησή της.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(ανώνυμο)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(εικόνα)</translation>
     </message>
@@ -116,37 +116,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>Εμφάνιση άρθρου</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Από </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>Απόκρυψη άρθρου</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Σφάλμα αναζήτησης: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Παρόμοια λήμματα: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Σύνθετες εκφράσεις: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Μεμονωμένες λέξεις: </translation>
     </message>
@@ -154,57 +154,57 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Επιλογή τρέχοντος άρθρου</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
-        <translation type="unfinished"></translation>
+        <translation>Αντιγραφή ως κείμενο</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
-        <translation type="unfinished"></translation>
+        <translation>Επιθεωρητής</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Πόρος</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>Φωνή TTS</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Εικόνα</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Βίντεο</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Βίντεο: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Ορισμός στο λεξικό &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Ορισμός: %1</translation>
     </message>
@@ -213,38 +213,39 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Δεν υπάρχει ο ζητούμενος πόρος.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Δεν υπάρχει το ζητούμενο πρόγραμμα ήχου.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ΣΦΑΛΜΑ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Αποθήκευση ήχου</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Αρχείο ήχου (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Αποθήκευση εικόνας</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Αρχείο εικόνας (*.bmp *.jpg *.png *.tif);;Όλα τα αρχεία (*.*)</translation>
     </message>
@@ -253,55 +254,55 @@
         <translation type="obsolete">Σφάλμα αποθήκευσης:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>Άνοι&amp;γμα συνδέσμου</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Άνοιγμα συνδέσμου σε νέα &amp;καρτέλα</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Άνοιγμα συνδέσμου σε &amp;εξωτερικό περιηγητή</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>Ανα&amp;ζήτηση του &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Αναζήτηση του &quot;%1&quot; σε &amp;νέα καρτέλα</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Αποστολή του &quot;%1&quot; στη γραμμή εισόδου</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Προσθήκη του &quot;%1&quot; στο ιστορικό</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Αναζήτηση του &quot;%1&quot; στο %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Αναζήτηση του &quot;%1&quot; στο %2 σε &amp;νέα καρτέλα</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>ΠΡΟΣΟΧΗ: Αναπαραγωγή ήχου FFmpeg: %1</translation>
     </message>
     <message>
         <source>Playing a non-WAV file</source>
@@ -320,37 +321,37 @@
         <translation type="obsolete">Η βιβλιοθήκη Bass δεν μπορεί να αναπαράγει αυτόν τον ήχο.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Δεν ήταν δυνατή η αναπαραγωγή του αρχείου ήχου: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Απέτυχε η δημιουργία προσωρινού αρχείου.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Απέτυχε το αυτόματο άνοιγμα του αρχείου· δοκιμάστε να το ανοίξετε χειροκίνητα: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Απέτυχε η λήψη του ζητούμενου πόρου.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Αποθήκευση &amp;Εικόνας...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Αποθήκευση ή&amp;χου...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ΠΡΟΣΟΧΗ: %1</translation>
     </message>
@@ -360,42 +361,44 @@
         <translation>Μορφή</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Εύρεση:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Προηγούμενο</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Επόμενο</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Διάκριση πεζών/κεφαλαίων</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Επι&amp;σήμανση Όλων</translation>
     </message>
@@ -423,6 +426,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Κωδικός:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -523,6 +549,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Αρχεία κειμένου (*.txt);;Όλα τα αρχεία (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Ακύρωση</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -547,12 +686,12 @@
     <message>
         <location filename="../dictinfo.ui" line="91"/>
         <source>Open folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Άνοιγμα φακέλου</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="110"/>
         <source>Edit dictionary</source>
-        <translation type="unfinished">Επεξεργασία λεξικού</translation>
+        <translation>Επεξεργασία λεξικού</translation>
     </message>
     <message>
         <location filename="../dictinfo.ui" line="120"/>
@@ -565,10 +704,20 @@
         <translation>Περιγραφή:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Επεξεργασία του λεξικού με χρήση της εντολής: %1</translation>
     </message>
 </context>
 <context>
@@ -580,6 +729,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Όνομα</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Διεύθυνση</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Εικονίδιο</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -593,7 +810,7 @@
     <message>
         <location filename="../dictionarybar.cc" line="25"/>
         <source>Extended menu with all dictionaries...</source>
-        <translation type="unfinished"></translation>
+        <translation>Πλήρες μενού με όλα τα λεξικά...</translation>
     </message>
     <message>
         <location filename="../dictionarybar.cc" line="112"/>
@@ -601,17 +818,22 @@
         <translation>Επεξεργασία αυτής της ομάδας</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Πληροφορίες λεξικού</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
-        <source>Open dictionary folder</source>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="143"/>
+        <source>Open dictionary folder</source>
+        <translation>Άνοιγμα φακέλου λεξικού</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Επεξεργασία λεξικού</translation>
     </message>
@@ -619,39 +841,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Πηγές</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Λεξικά</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Ομάδες</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Οι πηγές άλλαξαν</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Ορισμένες πηγές άλλαξαν. Αποδέχεστε τις αλλαγές;</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Αποδοχή</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
@@ -670,6 +892,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Κανένα</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Κανένα</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -708,6 +1016,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -747,43 +1114,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Προσθήκη ομάδας</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Εισάγετε το όνομα της νέας ομάδας:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Μετονομασία ομάδας</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Εισάγετε το νέο όνομα της ομάδας:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Αφαίρεση ομάδας</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Σίγουρα θέλετε να αφαιρέσετε την ομάδα &lt;b&gt;%1&lt;/b&gt;;</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Αφαίρεση όλων των ομάδων</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Σίγουρα θέλετε να αφαιρέσετε όλες τις ομάδες;</translation>
     </message>
@@ -884,6 +1261,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Πίσω</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Μπροστά</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Μεγέθυνση</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Σμίκρυνση</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Κανονικό μέγεθος</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -914,12 +1339,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Προτάσεις ορθογραφίας:</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Μορφολογία για %1</translation>
     </message>
@@ -927,12 +1352,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Ενεργή</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
@@ -1891,7 +2316,7 @@
     <message>
         <location filename="../language.cc" line="240"/>
         <source>Lojban</source>
-        <translation type="unfinished"></translation>
+        <translation>Lojban</translation>
     </message>
     <message>
         <location filename="../language.cc" line="375"/>
@@ -1972,7 +2397,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Σφάλμα κατά τη φόρτωση των λεξικών</translation>
     </message>
@@ -1980,9 +2405,9 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>Σφάλμα στο αρχείο ρυθμίσεων. Συνέχεια με χρήση των προεπιλεγμένων ρυθμίσεων;</translation>
     </message>
 </context>
 <context>
@@ -1992,18 +2417,18 @@
         <translation type="obsolete">Εμφάνιση ονομάτων στη γραμμή λεξικών</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Γραμμή &amp;μενού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Αναζήτηση σε:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Λεξικά:</translation>
     </message>
@@ -2012,226 +2437,237 @@
         <translation type="obsolete">Πλοήγηση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Πίσω</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Μπροστά</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Αναδυόμενο παράθυρο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Εκφώνηση λήμματος (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Μεγέθυνση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Σμίκρυνση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Κανονικό μέγεθος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Μεγέθυνση λημμάτων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Σμίκρυνση λημμάτων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Κανονικό μέγεθος λημμάτων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Εμφάνιση &amp;κύριου παραθύρου</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Κλείσιμο τρέχουσας καρτέλας</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Κλείσιμο όλων των καρτελών</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Κλείσιμο όλων των άλλων καρτελών</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Δεν είναι ενεργοποιημένο το API προσβασιμότητας</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>Άρθρο, πλήρες (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>Άρθρο, μόνο HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
-        <translation type="unfinished"></translation>
+        <translation>Αποθήκευση άρθρου...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Το κύριο παράθυρο βρίσκεται πάντα στο προσκήνιο.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Απόκρυψη</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Εξαγωγή ιστορικού σε αρχείο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Αρχεία κειμένου (*.txt);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Ολοκληρώθηκε η εξαγωγή του ιστορικού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Σφάλμα εξαγωγής:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Εισαγωγή ιστορικού από αρχείο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Σφάλμα εισαγωγής: μη έγκυρα δεδομένα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Ολοκληρώθηκε η εισαγωγή του ιστορικού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Σφάλμα εισαγωγής:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Πληροφορίες λεξικού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
-        <source>Open dictionary folder</source>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3926"/>
+        <source>Open dictionary folder</source>
+        <translation>Άνοιγμα φακέλου λεξικού</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Επεξεργασία λεξικού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>Έ&amp;ξοδος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Φόρτωση...</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Καλώς ήλθατε!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 λεξικά, %2 άρθρα, %3 λήμματα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Αναζήτηση:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Όλα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Ανοιχτές καρτέλες</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Εμφάνιση &amp;ονομάτων λεξικών</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Μι&amp;κρά εικονίδια</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>Γραμμή &amp;αναζήτησης</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Λίστα ανοιχτών καρτελών</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(ανώνυμο)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2244,57 +2680,57 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Απέτυχε η φόρτωση του μηχανισμού παρακολούθησης πλήκτρων συντομεύσεων.&lt;br&gt;Βεβαιωθείτε ότι η επέκταση RECORD του XServer είναι ενεργοποιημένη.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Νέα έκδοση διαθέσιμη</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Η έκδοση &lt;b&gt;%1&lt;/b&gt; του GoldenDict είναι διαθέσιμη.&lt;br&gt;Κάντε κλικ στο &lt;b&gt;Λήψη&lt;/b&gt; για να επισκεφτείτε την ιστοσελίδα λήψης.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Λήψη</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Παράβλεψη αυτής της έκδοσης</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Επιλέξατε απόκρυψη μιας γραμμής εργαλείων. Πατήστε %1 για να την επαναφέρετε.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Διάταξη σελίδας</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Δε βρέθηκε εκτυπωτής. Παρακαλώ εγκαταστήστε έναν εκτυπωτή.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Εκτύπωση αποτελέσματος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Αποθήκευση αποτελέσματος ως</translation>
     </message>
@@ -2303,42 +2739,42 @@
         <translation type="obsolete">Αρχείο html (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Αδύνατη η αποθήκευση του άρθρου: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Αρχείο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Επεξεργασία</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Βοήθεια</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Προβολή</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>Με&amp;γέθυνση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Ιστορικό</translation>
     </message>
@@ -2347,12 +2783,12 @@
         <translation type="obsolete">Στήλη αναζήτησης</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Λεξικά...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
@@ -2361,148 +2797,178 @@
         <translation type="obsolete">&amp;Ομάδες...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Στήλη ανα&amp;ζήτησης</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Στήλη περιήγησης αποτελε&amp;σμάτων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Στήλη &amp;ιστορικού</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Προτιμήσεις...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Ιστοσελίδα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Περί</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Περί GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Έξοδος εφαρμογής</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Φόρουμ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Ελαχιστοποιεί το παράθυρο ως εικονίδιο στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Αποθήκευση άρθρου</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Αποθήκευση άρθρου</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>Εκ&amp;τύπωση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Διάταξη σελίδας</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>&amp;Προεπισκόπηση εκτύπωσης</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Νέα &amp;σάρωση αρχείων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Νέα καρτέλα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Πάντα στο &amp;προσκήνιο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Πάντα στο προσκήνιο</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Κουμπί μενού</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Προεπισκόπηση εκτύπωσης</translation>
     </message>
@@ -2511,48 +2977,48 @@
         <translation type="obsolete">Νέα σάρωση αρχείων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>Εκκα&amp;θάριση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Νέα καρτέλα</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Φάκελος &amp;ρυθμίσεων</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>Εμ&amp;φάνιση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>Ε&amp;ξαγωγή</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Εισαγωγή</translation>
     </message>
@@ -2560,20 +3026,20 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>Το αρχείο λεξικού είναι αλλοιωμένο ή κατεστραμμένο</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε η φόρτωση του άρθρου από το %1. Αιτία: %2</translation>
     </message>
 </context>
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Σφάλμα ανάλυσης XML: %1 στο %2,%3</translation>
     </message>
@@ -2581,7 +3047,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Σφάλμα ανάλυσης XML: %1 στο %2,%3</translation>
     </message>
@@ -2589,22 +3055,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Ενεργή</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Εικονίδιο</translation>
     </message>
@@ -2617,88 +3083,94 @@
         <translation>Μορφή</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Λίστα λεξικών:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Ανενεργά (απενεργοποιημένα) λεξικά:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Πληροφορίες λεξικού</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Όνομα:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Σύνολο άρθρων:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Σύνολο λημμάτων:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Μεταφράζει από:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Μεταφράζει σε:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Περιγραφή:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Αρχεία λεξικού:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Μπορείτε να αλλάξετε τη σειρά εμφάνισης των λεξικών, σέρνοντάς τα με το ποντίκι. Σύρετε λεξικά στην ομάδα των ανενεργών για να τα απενεργοποιήσετε.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Ταξινόμηση κατά όνομα</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Ταξινόμηση κατά γλώσσα</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Διαδρομή</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Υποφάκελοι</translation>
     </message>
@@ -2706,7 +3178,7 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Συστήματος</translation>
     </message>
@@ -2719,46 +3191,47 @@
         <translation type="obsolete">Ρωσικά</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Κλασική</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
-        <translation type="unfinished"></translation>
+        <translation>Μοντέρνα</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
-        <translation type="unfinished"></translation>
+        <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Lingoes-Blue</translation>
     </message>
     <message>
         <source>Play via DirectShow</source>
         <translation type="obsolete">Αναπαραγωγή μέσω DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Αλλαγή γλώσσας</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Απαιτείται επανεκκίνηση του προγράμματος για να εφαρμοστεί η αλλαγή γλώσσας.</translation>
     </message>
@@ -2880,12 +3353,12 @@
         <translation>Μορφή εμφάνισης:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>Ανα&amp;δυόμενο παράθυρο</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2897,7 +3370,7 @@
 παράθυρο ή από το εικονίδιο της περιοχής ειδοποιήσεων.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Ενεργοποίηση λειτουργίας αναδυόμενου παραθύρου</translation>
     </message>
@@ -2946,17 +3419,22 @@
         <translation>Στιλ πρόσθετων:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
-        <source>Adjust this value to avoid huge context menus.</source>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="334"/>
+        <source>Adjust this value to avoid huge context menus.</source>
+        <translation>Προσαρμόστε αυτήν την τιμή για να μειώσετε το μέγεθος του μενού περιεχομένου.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
-        <translation type="unfinished"></translation>
+        <translation>Αριθμός λεξικών μενού περιεχομένου:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Καθορίζει αν θα είναι προεπιλεγμένη η λειτουργία αναδυόμενου παραθύρου.
@@ -2964,124 +3442,124 @@
 παράθυρο ενεργοποιημένο.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Εκκίνηση με το αναδυόμενο παράθυρο ενεργοποιημένο</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Αν ενεργοποιηθεί, το αναδυόμενο παράθυρο θα εμφανίζεται μόνο αν είναι
 πατημένα όλα τα παρακάτω πλήκτρα όταν γίνεται η επιλογή της λέξης.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Αναδυόμενο παράθυρο μόνο αν είναι πατημένα όλα τα επιλεγμένα πλήκτρα:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Μόνο το αριστερό Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Aριστερό Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Μόνο το δεξί Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Δεξί Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Πλήκτρο Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Πλήκτρο Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Μόνο το αριστερό Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Αριστερό Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Πλήκτρο Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Μόνο το δεξί Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Δεξί Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Μόνο το δεξί Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Δεξί Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Μόνο το αριστερό Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Αριστερό Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Πλήκτρο Windows ή Meta (Μενού)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3092,51 +3570,86 @@
 να πατάτε τα πλήκτρα αμέσως μετά την επιλογή της λέξης.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Εμφάνιση της μετάφρασης στο κύριο παράθυρο αντί για το αναδυόμενο</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Εμφάνιση μετάφρασης στο κύριο παράθυρο</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Αναπαραγωγή</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
-        <translation type="unfinished"></translation>
+        <translation>Αναπαραγωγή αρχείων ήχου μέσω FFmpeg(libav) και libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
+        <translation>Χρήση εσωτερικού προγράμματος</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
-        <source>Select this option to automatic collapse big articles</source>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
-        <source>Collapse articles more than</source>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
-        <source>Articles longer than this size will be collapsed</source>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
-        <source>symbols</source>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../preferences.ui" line="1528"/>
+        <source>Select this option to automatic collapse big articles</source>
+        <translation>Αν σημειώσετε αυτήν την επιλογή, τα μεγάλα άρθρα θα αποκρύπτονται αυτόματα</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1531"/>
+        <source>Collapse articles more than</source>
+        <translation>Απόκρυψη άρθρων με περισσότερα από</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1538"/>
+        <source>Articles longer than this size will be collapsed</source>
+        <translation>Αποκρύψη των άρθρων που υπερβαίνουν αυτό το μέγεθος</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1554"/>
+        <source>symbols</source>
+        <translation>σύμβολα</translation>
+    </message>
+    <message>
         <source>Use Windows native playback API. Limited to .wav files only,
 but works very well.</source>
         <translation type="obsolete">Χρήση μόνο του εγγενούς API των Windows.
@@ -3167,38 +3680,39 @@
         <translation type="obsolete">Αναπαραγωγή μέσω βιβλιοθήκης Bass</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Χρήση οποιουδήποτε εξωτερικού προγράμματος για την αναπαραγωγή αρχείων ήχου</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Χρήση εξωτερικού προγράμματος:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ορισμένες ιστοσελίδες εντοπίζουν το GoldenDict μέσω των κεφαλίδων HTTP και μπλοκάρουν τα αιτήματά του.
+Ενεργοποιήστε αυτή την επιλογή για να παρακάμψετε το πρόβλημα.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Μη ταυτοποίηση του GoldenDict στις κεφαλίδες HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Για &amp;προχωρημένους</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Προχωρημένες τεχνολογίες αναδυόμενου παραθύρου</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3209,12 +3723,12 @@
 αυτά τα προγράμματα, δεν χρειάζεται να ενεργοποιήσετε την επιλογή.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>&amp;Χρήση IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3224,12 +3738,12 @@
 δεν χρειάζεται να ενεργοποιήσετε την επιλογή.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Χ&amp;ρήση UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3239,63 +3753,63 @@
 δεν χρειάζεται να ενεργοποιήσετε την επιλογή.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Χρήση &amp;μηνυμάτων Goldendict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Ιστορικό</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Αν ενεργοποιηθεί, θα αποθηκεύεται το ιστορικό των μεταφρασμένων λέξεων</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Αποθήκευση &amp;ιστορικού</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Ορίστε το μέγιστο αριθμό λημμάτων που θα αποθηκεύονται στο ιστορικό.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Μέγιστο μέγεθος ιστορικού:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Συχνότητα αποθήκευσης ιστορικού. Αν χρησιμοποιήσετε 0, 
 το ιστορικό θα αποθηκεύεται μόνο κατά την έξοδο.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Αποθήκευση κάθε</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>λεπτά</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Άρθρα</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Αν ενεργοποιηθεί, θα εμφανίζονται πάντα τα προαιρετικά τμήματα των άρθρων</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Εμφάνιση &amp;προαιρετικών τμημάτων</translation>
     </message>
@@ -3310,12 +3824,12 @@
 να πατάτε τα πλήκτρα αμέσως μετά την επιλογή της λέξης.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Εκ των υστέρων πάτημα πλήκτρων, εντός</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3324,32 +3838,32 @@
 μετά την επιλογή της λέξης.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>δευτ.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Συντομεύσεις</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Συντόμευση για εμφάνιση/απόκρυψη κύριου παραθύρου:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Συντόμευση για αναζήτηση λέξης που βρίσκεται στο πρόχειρο:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Οι συντομεύσεις λειτουργούν παντού και από οποιαδήποτε εφαρμογή, αρκεί να εκτελείται το GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3362,22 +3876,22 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Σημείωση: Μάλλον χρησιμοποιείτε έκδοση του X.Org XServer στην οποία δε λειτουργεί η επέκταση RECORD. Κατά πάσα πιθανότητα, οι συντομεύσεις του GoldenDict δε θα λειτουργήσουν. Το σφάλμα θα πρέπει να διορθωθεί σε επίπεδο X.Org XServer. Παρακαλώ, ανατρέξτε σε αυτήν την &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;αναφορά σφάλματος&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; και προσθέστε σχόλιο, αν το επιθυμείτε.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>Ή&amp;χος</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Προφορά</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Αυτόματη εκφώνηση λημμάτων στο κύριο παράθυρο</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Αυτόματη εκφώνηση λημμάτων στο αναδυόμενο παράθυρο</translation>
     </message>
@@ -3386,49 +3900,49 @@
         <translation type="obsolete">Πρόγραμμα αναπαραγωγής αρχείων ήχου:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Δίκτυο</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Επιλέξτε το αν θέλετε να χρησιμοποιείτε
 διαμεσολαβητή για όλες τις ανάγκες της εφαρμογής.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Χρήση διαμεσολαβητή</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Τύπος:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Διεύθυνση:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Θύρα:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Χρήστης:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Κωδικός:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3438,12 +3952,12 @@
 προβλήματα με κάποιους ιστοτόπους, δοκιμάστε να το αποεπιλέξετε.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Φραγή περιεχομένου από άλλους ιστοτόπους (εξαφανίζει τις περισσότερες διαφημίσεις)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3452,12 +3966,12 @@
 το κατάλληλο πρόσθετο για να χρησιμοποιήσετε αυτή την επιλογή.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Ενεργοποίηση διαδικτυακών προσθέτων</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3469,7 +3983,7 @@
 χρήστη και θα παραπέμπει στην ιστοσελίδα λήψης.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Περιοδικός έλεγχος για νέες εκδόσεις/ενημερώσεις</translation>
     </message>
@@ -3477,27 +3991,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Απλό κείμενο</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Ανάλογα με την επέκταση</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Άγνωστο</translation>
     </message>
@@ -3523,27 +4037,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Ενεργό</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Γραμμή εντολών</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Εικονίδιο</translation>
     </message>
@@ -3551,99 +4065,101 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
-        <translation type="unfinished"></translation>
+        <translation>Σφάλμα φόρτωσης άρθρου</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
-        <translation type="unfinished"></translation>
+        <translation>Σφάλμα αποκωδικοποίησης άρθρου</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="140"/>
         <source>avformat_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το avformat_alloc_context().</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="147"/>
         <source>av_malloc() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το av_malloc().</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="156"/>
         <source>avio_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το avio_alloc_context().</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="173"/>
         <source>avformat_open_input() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το avformat_open_input(): %1.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="180"/>
         <source>avformat_find_stream_info() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το avformat_find_stream_info(): %1.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="195"/>
         <source>Could not find audio stream.</source>
-        <translation type="unfinished"></translation>
+        <translation>Δε βρέθηκε η ροή ήχου.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="203"/>
         <source>Codec [id: %1] not found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Δε βρέθηκε ο codec [id: %1].</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="210"/>
         <source>avcodec_open2() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το avcodec_open2(): %1.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="271"/>
         <source>Cannot find usable audio output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Δε βρέθηκε λειτουργική συσκευή εξόδου ήχου.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="284"/>
         <source>Unsupported sample format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Μη υποστηριζόμενη μορφή.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="294"/>
         <source>ao_open_live() failed: </source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το ao_open_live(): </translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="299"/>
         <source>No driver.</source>
-        <translation type="unfinished"></translation>
+        <translation>Δε βρέθηκε ο οδηγός.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="302"/>
         <source>This driver is not a live output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Αυτός ο οδηγός δεν είναι συσκευή ζωντανής εξόδου ήχου.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="305"/>
         <source>A valid option key has an invalid value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Μία έγκυρη επιλογή δεν διαθέτει έγκυρη τιμή.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="308"/>
         <source>Cannot open the device: %1, channels: %2, rate: %3, bits: %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>Δεν είναι δυνατή η ενεργοποίηση της συσκευής: %1, κανάλια: %2, ταχύτητα: %3, bit: %4.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="315"/>
         <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Άγνωστο σφάλμα.</translation>
     </message>
     <message>
         <location filename="../ffmpegaudio.cc" line="340"/>
         <source>avcodec_alloc_frame() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Απέτυχε το avcodec_alloc_frame().</translation>
     </message>
 </context>
 <context>
@@ -3667,31 +4183,31 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
-        <translation type="unfinished">ΣΦΑΛΜΑ: %1</translation>
+        <translation>ΣΦΑΛΜΑ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
-        <translation type="unfinished">Σφάλμα αποθήκευσης:</translation>
+        <translation>Σφάλμα αποθήκευσης:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
-        <translation type="unfinished">Απέτυχε η λήψη του ζητούμενου πόρου.</translation>
+        <translation>Απέτυχε η λήψη του ζητούμενου πόρου.</translation>
     </message>
 </context>
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji για Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji για Katakana</translation>
     </message>
@@ -3720,21 +4236,21 @@
         <translation type="obsolete">Εμφάνιση αποτελεσμάτων (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Πίσω</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Μπροστά</translation>
     </message>
@@ -3743,32 +4259,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Εκφώνηση λήμματος (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Εμφάνιση στο κύριο παράθυρο (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Εμφάνιση ή απόκρυψη της γραμμής λεξικών</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Χρησιμοποιήστε το για να μετατρέψετε το αναδυόμενο σε κανονικό παράθυρο, που δεν εξαφανίζεται από την οθόνη και μπορεί π.χ. να αλλάξει μέγεθος.</translation>
@@ -3778,8 +4294,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation></translation>
     </message>
@@ -3787,17 +4303,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Διαδρομή</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Εικονίδιο</translation>
     </message>
@@ -3805,45 +4321,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
-        <translation type="unfinished"></translation>
+        <translation>Εκφώνηση κειμένου</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(μη διαθέσιμο στη φορητή έκδοση)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Επιλογή φακέλου</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Επιβεβαίωση αφαίρεσης</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Να αφαιρεθεί ο φάκελος &lt;b&gt;%1&lt;/b&gt; από τη λίστα;</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Να αφαιρεθεί η ιστοσελίδα &lt;b&gt;%1&lt;/b&gt; από τη λίστα;</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Να αφαιρεθεί το πρόγραμμα &lt;b&gt;%1&lt;/b&gt; από τη λίστα;</translation>
     </message>
@@ -3862,7 +4380,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>Προσ&amp;θήκη...</translation>
     </message>
@@ -3871,7 +4390,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>Α&amp;φαίρεση</translation>
     </message>
@@ -3898,7 +4418,7 @@
     <message>
         <location filename="../sources.ui" line="162"/>
         <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
-        <translation>Διαδρομή φακέλου με λεξικά Hunspell/Myspell:</translation>
+        <translation>Φάκελος με λεξικά Hunspell/Myspell:</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="178"/>
@@ -3908,7 +4428,7 @@
     <message>
         <location filename="../sources.ui" line="187"/>
         <source>Available morphology dictionaries:</source>
-        <translation>Διαθέσιμα λεξικά μορφολογίας:</translation>
+        <translation>Διαθέσιμες μορφολογίες:</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="199"/>
@@ -3919,10 +4439,10 @@
 Add appropriate dictionaries to the bottoms
 of the appropriate groups to use them.</source>
         <translation>Τα λεξικά μορφολογίας εμφανίζονται ως 
-ξεχωριστά βοηθητικά λεξικά και παρέχουν
+ξεχωριστά βοηθητικά λεξικά και περιέχουν
 ρίζες λέξεων και προτάσεις ορθογραφίας.
-Προσθέστε λεξικά μορφολογίας στο τέλος
-μιας ομάδας για να τα χρησιμοποιήσετε.</translation>
+Μπορείτε να προσθέτετε τα κατάλληλα λεξικά
+μορφολογίας στο τέλος κάθε ομάδας λεξικών.</translation>
     </message>
     <message>
         <location filename="../sources.ui" line="224"/>
@@ -3949,7 +4469,7 @@
         <translation type="obsolete">Εναλλακτικά, χρησιμοποιήστε %GD1253% για κωδικοποίηση CP1253, %GDISO7% για ISO 8859-7.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Προγράμματα</translation>
     </message>
@@ -3958,27 +4478,27 @@
         <translation type="obsolete">Προσθέστε οποιοδήποτε εξωτερικό πρόγραμμα. Οι χαρακτήρες %GDWORD% αντικαθίστανται από τη ζητούμενη λέξη. Η λέξη στέλνεται και στη συνήθη είσοδο.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Ζωντανή προφορά από το &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Ο ιστότοπος σας επιτρέπει να ηχογραφείτε και να μοιράζεστε προφορές λέξεων. Μπορείτε να ακούτε τις προφορές του Forvo στο GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Ενεργοποίηση προφορών από το Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Κλειδί API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -4006,37 +4526,37 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Αποκτήστε το προσωπικό σας κλειδί από &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;εδώ&lt;/span&gt;&lt;/a&gt;, ή αφήστε κενό για να χρησιμοποιήσετε το προεπιλεγμένο.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Κωδικοί γλωσσών (χωρισμένοι με κόμματα):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Λίστα με τους κωδικούς γλωσσών που επιθυμείτε να χρησιμοποιήσετε. Π.χ.: &quot;en, el&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Ο πλήρης κατάλογος των κωδικών γλωσσών είναι διαθέσιμος &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;εδώ&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Μεταγραφή</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Ρωσικά</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Γερμανικά</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Ελληνικά</translation>
     </message>
@@ -4044,52 +4564,63 @@
         <location filename="../sources.ui" line="334"/>
         <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
 %GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
+        <translation>Εναλλακτικά, χρησιμοποιήστε %GD1253% για κωδικοποίηση CP1253, %GDISO1%...%GDISO16% για ISO 8859-1...ISO 8859-16 αντιστοίχως,
+%GDBIG5% για Big-5, %GDBIG5HKSCS% για Big5-HKSCS, %GDGBK% για GBK και GB18030, %GDSHIFTJIS% για Shift-JIS.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources.ui" line="353"/>
-        <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
+        <source>DICT servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="409"/>
+        <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
+        <translation>Προσθέστε οποιοδήποτε εξωτερικό πρόγραμμα. Οι χαρακτήρες %GDWORD% αντικαθίστανται από τη ζητούμενη λέξη. Αν το %GDWORD% λείπει, η λέξη θα σταλεί στη συνήθη είσοδο.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Αποκτήστε το προσωπικό σας κλειδί από &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;εδώ&lt;/a&gt;, ή αφήστε κενό για να χρησιμοποιήσετε το προεπιλεγμένο.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Λευκορωσικά</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Επιτρέπει τη χρήση του Λατινικού αλφαβήτου για τη μεταγραφή Ιαπωνικών</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Ιαπωνικά Romaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Μέθοδοι:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Η πιο διαδεδομένη μέθοδος μεταγραφής Ιαπωνικών,
 βασισμένη στην αγγλική φωνολογία</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4100,12 +4631,12 @@
 Δεν υποστηρίζεται ακόμη από το GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4116,32 +4647,32 @@
 Δεν υποστηρίζεται ακόμη από το GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Χαρακτήρες:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Ιαπωνικοί χαρακτήρες Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Ιαπωνικοί χαρακτήρες Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4159,77 +4690,77 @@
     <message>
         <location filename="../texttospeechsource.ui" line="33"/>
         <source>Selected voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>Επιλεγμένες μηχανές εκφώνησης:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="53"/>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Προσ&amp;θήκη</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="60"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished">Α&amp;φαίρεση</translation>
+        <translation>Α&amp;φαίρεση</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="84"/>
         <source>Preferences</source>
-        <translation type="unfinished">Προτιμήσεις</translation>
+        <translation>Προτιμήσεις</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="90"/>
         <source>Volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ένταση:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="119"/>
         <source>Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ταχύτητα:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="151"/>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Προεπισκόπηση</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="165"/>
         <source>Available voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>Διαθέσιμες μηχανές εκφώνησης:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="183"/>
         <source>Text to be previewed:</source>
-        <translation type="unfinished"></translation>
+        <translation>Κείμενο προεπισκόπησης:</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="190"/>
         <source>Type text to be previewed here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Εδώ προσθέτετε το κείμενο που θα εκφωνηθεί στην προεπισκόπηση.</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.ui" line="224"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Προεπισκόπηση</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="58"/>
         <source>No TTS voice available</source>
-        <translation type="unfinished"></translation>
+        <translation>Δεν υπάρχει διαθέσιμη φωνή TTS</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="59"/>
         <source>Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</source>
-        <translation type="unfinished"></translation>
+        <translation>Δε βρέθηκαν διαθέσιμες φωνές TTS.&lt;br&gt;Βεβαιωθείτε ότι έχετε εγκαταστήσει μία τουλάχιστον μηχανή TTS.</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="79"/>
         <source>Confirm removal</source>
-        <translation type="unfinished">Επιβεβαίωση αφαίρεσης</translation>
+        <translation>Επιβεβαίωση αφαίρεσης</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="80"/>
         <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>Να αφαιρεθεί η μηχανή εκφώνησης &lt;b&gt;%1&lt;/b&gt; από τη λίστα;</translation>
     </message>
 </context>
 <context>
@@ -4250,43 +4781,43 @@
     <message>
         <location filename="../texttospeechsource.cc" line="233"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Ενεργή</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="235"/>
         <source>Name</source>
-        <translation type="unfinished">Όνομα</translation>
+        <translation>Όνομα</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="237"/>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation>Id</translation>
     </message>
     <message>
         <location filename="../texttospeechsource.cc" line="239"/>
         <source>Icon</source>
-        <translation type="unfinished">Εικονίδιο</translation>
+        <translation>Εικονίδιο</translation>
     </message>
 </context>
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Ενεργή</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Εικονίδιο</translation>
     </message>
@@ -4294,7 +4825,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Απέτυχε η αναζήτηση σε ορισμένα λεξικά.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/es_AR.ts goldendict-1.5.0~git20150923/locale/es_AR.ts
--- goldendict-1.5.0~git20131003/locale/es_AR.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/es_AR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -49,7 +49,7 @@
         <translation>[Desconocido]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Basado en Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -57,62 +57,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Expandir artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Plegar artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>No se ha encontrado ninguna palabra para &lt;b&gt;%1&lt;/b&gt; en el grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>No se ha encontrado ninguna palabra en el grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;¡Bienvenido a &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Para comenzar a utilizar el programa, primero ingrese al menú &lt;b&gt;Editar|Diccionarios&lt;/b&gt; para agregar los directorios donde ubicar los diccionarios locales, configurar varios sitios de Wikipedia y definir otras fuentes de traducción online. Podrá también agrupar los diccionarios y ajustar el orden en el que aparecen los resultados de búsqueda.&lt;p&gt; ¡Y ahora, está listo para buscar las palabras que usted desee! La manera tradicional de utilizar un diccionario es introducir el término en el campo de búsqueda ubicado en el panel izquierdo de esta misma ventana. No obstante, a diferencia de la mayoría de los diccionarios electrónicos, no necesita ingresar la palabra específica (lo cual requiere un conocimiento básico de gramática de la lengua a ser traducida).  Con GoldenDict, usted puede escribir la forma flexionada de una palabra determinada, que el programa es capaz de reconocer sus raíces, y así efectuar su corrección morfológica. Otra característica fundamental de GoldenDict es que el campo de búsqueda no es la única forma de efectuar búsquedas de palabras: también se puede traducir palabras mientras se encuentra en otros programas por medio del uso de la función de ventana emergente del GoldenDict. Consulte  &lt;a href=&quot;Trabajar con la función de ventana emergente&quot;&gt;como buscar palabras desde otros programas&lt;/a&gt; para saber como funciona este método de búsqueda.&lt;p&gt;Para personalizar el programa, ingrese al menú &lt;b&gt;Editar|Preferencias&lt;/b&gt;. Cada opción tiene su propia ayuda que aparece cuando el cursor del mouse está posicionado encima de la misma por unos segundos.&lt;p&gt;Si necesita  más ayuda, tiene dudas, sugerencias o cualquier otro pedido, su participación en el &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;foro&lt;/a&gt; del programa es bienvenida.&lt;p&gt;Consulte el &lt;a href=&quot;http://goldendict.org/&quot;&gt;sitio web&lt;/a&gt; del programa para ver si existen nuevas actualizaciones del mismo.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencia de GNU GPLv3 o posterior.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Trabajar con la función de ventana emergente</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Trabajar con la función de ventana emergente&lt;/h3&gt;Para realizar búsquedas de palabras mientras se encuentra en otro programa, primeramente es preciso activar la función de ventana emergente siguiendo los siguientes pasos en la ventana principal del GoldenDict:&lt;p&gt;&lt;OL&gt;&lt;LI&gt;Ingrese en el menú &lt;b&gt;Editar|Preferencias&lt;/b&gt;;&lt;LI&gt;Haga click en la pestaña  &lt;i&gt;Ventana emergente de lectura&lt;/i&gt;;&lt;LI&gt;Marque la casilla de selección &lt;i&gt;Activar función de ventana emergente de lectura&lt;/i&gt;;&lt;LI&gt;Luego presione en &lt;em&gt;Aceptar&lt;/em&gt; para guardar la configuración.&lt;/OL&gt;&lt;p&gt;Con esta opción activada, puede marcar o desmarcar la exhibición de ventana emergente cuando así lo desee. Para ésto, existen dos formas:&lt;UL&gt;&lt;LI&gt;En la ventana principal, haga click en el botón &lt;em&gt;ventana emergente de lectura&lt;/em&gt;, cuya imagen se asemeja a una varita;&lt;LI&gt;En el ícono del programa que aparece en la bandeja del sistema, haga click con el botón derecho del mouse y marque la opción &lt;em&gt;ventana emergente de lectura&lt;/em&gt;.&lt;/UL&gt;&lt;p&gt;</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Una vez que esta opción sea activada, para cualquier palabra, frase o texto situado debajo del cursor del mouse, se mostrará una ventana emergente, exhibiendo inmediatamente los resultados de búsqueda.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Una vez que esta opción sea activada, para cualquier palabra, frase o texto selecciónelo con el mouse o  haga doble click sobre el mismo y se mostrará una ventana emergente, exhibiendo inmediatamente los resultados de búsqueda.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(sin título)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(imagen)</translation>
     </message>
@@ -120,7 +120,7 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Resultados de </translation>
     </message>
@@ -129,32 +129,32 @@
         <translation type="obsolete">From %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Expandir artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Plegar artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Error de consulta: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Palabras aproximadas: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Expresiones compuestas:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Palabras individuales:</translation>
     </message>
@@ -162,57 +162,57 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Seleccionar artículo actual</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Copiar como texto</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspeccionar</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Recurso</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Texto a Voz</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Imagen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definición de diccionario &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definición: %1</translation>
     </message>
@@ -221,38 +221,39 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>El recurso referenciado no existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>El programa de audio referenciado no existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ERROR: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Guardar audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Archivos de audio (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Guardar imagen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Archivos de imagen (*.bmp *.jpg *.png *.tif);;Todos los archivos (*.*)</translation>
     </message>
@@ -261,22 +262,22 @@
         <translation type="obsolete">Error al guardar recurso: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>Abrir &amp;vínculo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Abrir vínculo en nueva &amp;pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Abrir vínculo en Navegador &amp;Web externo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>ATENCIÓN: Reproductor de audio FFmpeg: %1</translation>
     </message>
@@ -289,33 +290,33 @@
         <translation type="obsolete">Guardar &amp;audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Buscar &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Buscar &quot;%1&quot; en una &amp;nueva pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Enviar &quot;%1&quot; a búsqueda</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Agregar &quot;%1&quot; a historial</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Buscar &quot;%1&quot; en %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Buscar &quot;%1&quot; en %2 en una nueva p&amp;estaña</translation>
     </message>
@@ -336,37 +337,37 @@
         <translation type="obsolete">La biblioteca Bass no puede reproducir este audio.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>No fue posible ejecutar un programa reproductor de audio: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>No fue posible crear archivo temporal.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>No fue posible abrir el archivo automáticamente, Intente abrirlo manualmente: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>No fue posible descargar el recurso referenciado.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Guardar &amp;imagen...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Guardar &amp;audio...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ATENCIÓN: %1</translation>
     </message>
@@ -376,42 +377,44 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>sobre:blanco</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Buscar:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>A&amp;nterior</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Siguiente</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Coincidencia de mayúsculas/minúsculas</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>&amp;Resaltar todo</translation>
     </message>
@@ -436,6 +439,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Contraseña:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -536,6 +562,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Documentos de texto (*.txt);;Todos los archivos (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -578,6 +717,16 @@
         <translation>Descripción:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -594,6 +743,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Activado</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Dirección</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Ícono</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -615,17 +832,22 @@
         <translation>Editar este grupo</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Información del diccionario</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Abrir carpeta del diccionario</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Editar diccionario</translation>
     </message>
@@ -633,39 +855,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Fuentes</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Diccionarios</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Fuentes modificadas</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Algunas fuentes fueron modificadas. Desea aceptar las modificaciones?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -684,6 +906,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Ninguno</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Ninguno</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -722,6 +1030,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -761,43 +1128,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Agregar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Ingrese un nombre para el nuevo grupo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Renombrar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Ingrese un nuevo nombre para el grupo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Eliminar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>¿Está seguro que desea eliminar el grupo &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Eliminar todos</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>¿Está seguro que desea eliminar todos los grupos?</translation>
     </message>
@@ -903,6 +1280,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Atrás</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Adelante</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Acercar</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Alejar</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Tamaño normal</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -933,7 +1358,7 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Sugerencias ortográficas: </translation>
     </message>
@@ -1678,7 +2103,7 @@
         <translation type="obsolete">Zulu</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfología de %1</translation>
     </message>
@@ -1686,12 +2111,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -2731,7 +3156,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Error al cargar diccionarios</translation>
     </message>
@@ -2739,7 +3164,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Error en archivo de configuración. ¿Desea continuar con los valores por defecto?</translation>
     </message>
@@ -2751,17 +3176,17 @@
         <translation type="obsolete">Barra de navegación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Ventana emergente de lectura</translation>
     </message>
@@ -2770,23 +3195,23 @@
         <translation type="obsolete">Pronounce word</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>&amp;Mostrar ventana principal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Cargando...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Saltarse esta versión</translation>
     </message>
@@ -2795,32 +3220,32 @@
         <translation type="obsolete">[Unknown]</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Configurar página</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Impresora no disponible. Por favor instale una primero.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Imprimir artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artículo, Completo (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artículo, sólo HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Guardar artículo como</translation>
     </message>
@@ -2829,12 +3254,12 @@
         <translation type="obsolete">Archivos HTML (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>No es posible guardar el artículo: %1</translation>
     </message>
@@ -2843,33 +3268,33 @@
         <translation type="obsolete">Error loading dictionaries</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 diccionarios, %2 artículos, %3 palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>No fue posible inicializar el mecanismo de monitoreo de las teclas de acceso rápido. Verifique que su XServer posea la extensión RECORD activada.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Nueva versión disponible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>La versión &lt;b&gt;%1&lt;/b&gt; de GoldenDict está disponible ahora para descargar.&lt;br&gt;Haga click en &lt;b&gt;Descargar&lt;/b&gt; para ir a la página web de descarga.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Buscar en:</translation>
     </message>
@@ -2882,108 +3307,114 @@
         <translation type="obsolete">Mostrar íconos pequeños en las barras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Barra de &amp;menú</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Resultados en diccionarios:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Mostrar n&amp;ombres en la barra de diccionarios</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Mostrar íconos &amp;pequeños en las barras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>Barra de &amp;navegación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Acercar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Alejar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Tamaño normal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Aumentar tamaño palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Reducir tamaño palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Tamaño normal de palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Cerrar pestaña actual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Cerrar todas las pestañas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Cerrar todas las pestañas excepto la actual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Buscar:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>La función de accesibilidad no esta activada</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Guardando artículo...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>La ventana principal del programa se ha configurado para aparecer siempre visible.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importar historial desde archivo</translation>
     </message>
@@ -2992,52 +3423,57 @@
         <translation type="obsolete">Importado desde archivo:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Error de importación: datos inválidos en el archivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Importación de historial finalizada</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Error de importación: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Información del diccionario</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Abrir carpeta del diccionario</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Editar diccionario</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Pestañas abiertas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Abrir lista de pestañas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(sin título)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3046,17 +3482,17 @@
         <translation type="obsolete">ATENCIÓN: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Ha elegido ocultar la barra de menú. Utilice %1 para mostrarla nuevamente.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ocultar</translation>
     </message>
@@ -3065,23 +3501,23 @@
         <translation type="obsolete">Modo vista historial</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Exportar historial a archivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Documentos de texto (*.txt);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Exportación de historial finalizada</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Error de exportación:</translation>
     </message>
@@ -3099,22 +3535,22 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
@@ -3127,7 +3563,7 @@
         <translation type="obsolete">&amp;Diccionarios...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferencias...</translation>
     </message>
@@ -3136,7 +3572,7 @@
         <translation type="obsolete">&amp;Sources...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
@@ -3145,163 +3581,193 @@
         <translation type="obsolete">&amp;Grupos...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historial</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Diccionarios...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Cuadro de &amp;búsqueda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Cuadro de navegación de &amp;resultados</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Cuadro de &amp;historial</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Sitio web</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca de GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Acerca de GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Salir del programa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Foro</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Cerrar a bandeja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimiza la ventana a la bandeja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Guardar artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Guardar artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Configurar &amp;página</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>&amp;Vista preliminar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Reescanear archivos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nueva pestaña</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Siempre &amp;visible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Siempre visible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Menú principal</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Vista preliminar</translation>
     </message>
@@ -3310,48 +3776,48 @@
         <translation type="obsolete">Reescanear archivos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpiar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nueva pestaña</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Carpeta de &amp;configuración</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Mostrar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
@@ -3367,12 +3833,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>El archivo del diccionario ha sido manipulado o corrompido</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Error al cargar artículo de %1, motivo: %2</translation>
     </message>
@@ -3380,7 +3846,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Error de parsing XML: %1 en %2,%3</translation>
     </message>
@@ -3388,7 +3854,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Error de parsing XML: %1 en %2,%3</translation>
     </message>
@@ -3396,22 +3862,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ícono</translation>
     </message>
@@ -3424,88 +3890,94 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Orden de diccionarios:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Diccionarios inactivos (desactivados):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Información del diccionario</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Total de artículos:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Total de palabras:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Traduce de:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Traduce a:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Archivos que componen este diccionario:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Ajuste el orden de los diccionarios arrastrando y soltando los mismos en donde desee ubicarlos.Arrastre diccionarios al grupo de inactivos para desactivarlos.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Ordenar por nombre</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Ordenar por idiomas</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Ruta de directorio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Búsqueda recursiva</translation>
     </message>
@@ -3661,24 +4133,29 @@
         <translation>Estilo complementario:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Ajuste este valor para evitar menús contextuales enormes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Límite de diccionarios en menú contextual:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Elige si la ventana emergente de lectura se activará por defecto o no. Si estuviera tildada, 
 el programa siempre se iniciará con la ventana emergente de lectura activa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3689,27 +4166,27 @@
 también podrán presionarse luego de que la selección fuera realizada.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Teclas de acceso rápido</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Utilizar la siguiente tecla de acceso rápido para mostrar/ocultar la ventana principal:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Utilizar la siguiente tecla de acceso rápido para traducir una palabra del portapeles:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Las teclas de acceso rápido son globales y funcionan desde cualquier programa y dentro de cualquier contexto, siempre y cuando el GoldenDict esté siendo ejecutado en segundo plano.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Ventana emergente de lectura</translation>
     </message>
@@ -3719,7 +4196,7 @@
         <translation>Iniciar automáticamente el GoldenDict al terminar de iniciarse el sistema.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -3732,133 +4209,133 @@
         <translation type="obsolete">Scan popup functionality</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Activar función de ventana emergente de lectura</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Iniciar con la ventana emergente de lectura activada</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Con esta opción activada, la ventana emergente aparecerá sólo si todas las teclas seleccionadas estuvieran siendo presionadas cuando la selección de la palabra cambia.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Mostrar la ventana emergente sólo cuando se presionan todas las teclas seleccionadas abajo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Sólo Ctrl izquierdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl izquierdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Sólo Shift derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Shift derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tecla Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tecla Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Sólo Alt izquierdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt izquierdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tecla Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Sólo Alt derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Sólo Ctrl derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Sólo Shift izquierdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Shift izquierdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tecla Windows o tecla Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Las teclas pueden también presionarse posteriormente, dentro de los </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3866,22 +4343,22 @@
 después de realizada la seleción dentro del límite de tiempo especificado aquí.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Enviar palabra traducida a la ventana principal en lugar de mostrarla en la ventana emergente de lectura</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Enviar palabra traducida a la ventana principal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3895,57 +4372,92 @@
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Pronunciación</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Auto-pronunciar palabras en la ventana principal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Auto-pronunciar palabras en la ventana emergente de lectura</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Reproducción</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Reproducir archivos de audio vía FFmpeg(libav) y libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Utilizar reproductor de audio interno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Seleccionar esta opción para automáticamente plegar artículos grandes</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Plegar artículos con más de</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Los artículos que superen este tamaño aparecerán automáticamente plegados</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>símbolos</translation>
     </message>
@@ -3978,38 +4490,38 @@
         <translation type="obsolete">Reproducir vía biblioteca Bass</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Utilice un programa externo para reproducir archivos de audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Utilizar un programa externo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Algunos sitios web detectan GoldenDict vía encabezados HTTP y de esta manera lo bloquean. Active esta opción para eludir este problema.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>No identificar GoldenDict en encabezados HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>A&amp;vanzado</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Opciones avanzadas de ventana emergente de lectura</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -4019,12 +4531,12 @@
 No necesita seleccionar esta opción si no utiliza tales programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Utilizar &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -4033,12 +4545,12 @@
 No necesita seleccionar esta opción si no utiliza tales programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Utilizar &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -4047,62 +4559,62 @@
 No necesita seleccionar esta opción si no utiliza tales programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Utilizar &amp;GoldenDict message</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Activar esta opción para guardar el historial de las palabras traducidas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Guardar &amp;historial</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Indicar el máximo número de entradas para el historial.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Tamaño máximo del historial:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervalo para grabar historial. Si se configura en 0, el historial sólo se grabará al cerrar el programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Guardar cada</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artículos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Activar esta opción para expandir siempre las partes opcionales de artículos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Expandir &amp;partes opcionales</translation>
     </message>
@@ -4111,49 +4623,49 @@
         <translation type="obsolete">Program to play audio files:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Red</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Active esta opción para utilizar un servidor proxy 
 para todos los accesos a la red del programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Utilizar servidor proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -4162,12 +4674,12 @@
 que está accediendo. Si algunos sitios web dejan de funcionar, intente desactivar esta opción.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>No permitir la carga de contenido de otros sitios web (oculta la mayoría de los anuncios de publicidad)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -4176,12 +4688,12 @@
 El plugin debe estar instalado en el sistema para que esta opción funcione.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Activar plugins web</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -4193,12 +4705,12 @@
 página web de descarga utilizando el navegador de internet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Verificar periódicamente si hay nuevas versiones del programa</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Por defecto</translation>
     </message>
@@ -4211,32 +4723,33 @@
         <translation type="obsolete">Russian</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Por defecto</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blu</translation>
     </message>
@@ -4245,12 +4758,12 @@
         <translation type="obsolete">Reproducir vía DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Modificar idioma</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Reinicie el programa para aplicar el cambio de idioma.</translation>
     </message>
@@ -4258,27 +4771,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Texto simple</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Coincidencia prefijo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -4304,27 +4817,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Línea de comando</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ícono</translation>
     </message>
@@ -4332,12 +4845,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Error al cargar artículo</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Error al decodificar artículo</translation>
     </message>
@@ -4448,18 +4963,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ERROR: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Error al guardar recurso: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>No fue posible descargar el recurso referenciado.</translation>
     </message>
@@ -4467,12 +4982,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji para Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji para Katakana</translation>
     </message>
@@ -4505,12 +5020,12 @@
         <translation type="obsolete">palabra</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
@@ -4523,32 +5038,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Enviar palabra a la ventana principal (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Muestra u oculta la barra de diccionarios</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Utilice esta opción para fijar la ventana de modo que
@@ -4560,11 +5075,11 @@
         <translation type="obsolete">List matches</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4577,8 +5092,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -4586,17 +5101,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Ruta de directorio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ícono</translation>
     </message>
@@ -4604,45 +5119,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Texto a Voz</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(no disponible en versión portátil)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Elija un directorio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Confirmar eliminación</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿Eliminar el directorio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿Eliminar el sitio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿Eliminar el programa &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
@@ -4665,7 +5182,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Agregar...</translation>
     </message>
@@ -4674,7 +5192,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
@@ -4742,7 +5261,7 @@
         <translation type="obsolete">Como alternativa, puede utilizar %GD1251% para codificación  CP1251 y %GDISO1% para codificación ISO-8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programas</translation>
     </message>
@@ -4751,27 +5270,27 @@
         <translation type="obsolete">Ingrese todos los programas externos que quiera. La ocurrencia %GDWORD% se reemplazará por el término de búsqueda especificado. La misma también será enviada a la entrada estándar.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Pronunciación de palabras de &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Este sitio web permite grabar y compartir la pronunciación de palabras. Es posible escucharlas en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Activar la función para escuchar la pronunciación del sitio Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Clave API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -4781,7 +5300,7 @@
 obtener su propia clave.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Obtenga su propia clave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;aquí&lt;/a&gt;, o deje este campo en blanco para utilizar la clave por defecto.</translation>
     </message>
@@ -4811,79 +5330,89 @@
 respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% para GBK y GB18030, %GDSHIFTJIS% para Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Ingrese todos los programas externos que quiera. La ocurrencia %GDWORD% se reemplazará por el término de búsqueda especificado. Si la ocurrencia no esta presente, el término será enviado a la entrada estándar.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Códigos de idiomas (separados por coma):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista de códigos de idioma que a Ud. le gustaría tener. Por ejemplo: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Una lista completa de códigos de idioma está disponible &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;aquí&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteración</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Transliteración de ruso</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Transliteración de griego</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Transliteración de alemán</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Transliteración de bielorruso</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Permite utilizar el alfabeto latino para escribir el idioma japonés</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonés romanizado</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemas:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>El método de transcripción del japonés más utilizado,
 basado en la fonología inglesa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Romanización Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4894,12 +5423,12 @@
 Todavía no está implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4910,32 +5439,32 @@
 Todavía no está implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Silabarios:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Silabario japonés Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Silabario japonés Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -5083,22 +5612,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ícono</translation>
     </message>
@@ -5106,7 +5635,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>No fue posible consultar algunos diccionarios.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/es_BO.ts goldendict-1.5.0~git20150923/locale/es_BO.ts
--- goldendict-1.5.0~git20131003/locale/es_BO.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/es_BO.ts	2015-09-23 08:26:24.000000000 +0000
@@ -49,7 +49,7 @@
         <translation>[Desconocido]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -57,62 +57,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>No traducción de &lt;b&gt;%1&lt;/b&gt; fue encontrado en grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>No traducción fue encontrado en grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;¡Bienvenido a &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Para empezar utilizando el programa, primero vaya al menú &lt;b&gt;Editar|Diccionarios&lt;/b&gt; para añadir algunas rutas de directorios para buscar archivos de diccionarios, establecer sitios de Wikipedia o otros fuentes, ajustar el orden de diccionarios o crear grupos de diccionarios. &lt;p&gt;¡Entonces, Ud. puede empezar buscando palabras! Puede buscar en esta ventana utilizando el panel a la izquierda, o puede &lt;a href=&quot;Working with popup&quot;&gt;buscar palabras desde otras aplicaciones activas&lt;/a&gt;. &lt;p&gt;Para personalizar este programa, vaya a &lt;b&gt;Editar&amp;gt;Preferencias&lt;/b&gt;. Todas las opciones allí tienen concejos emergentes. Léalos si Ud. tiene dudas acerca de las opciones. &lt;p&gt;Si Ud. necesita más ayuda, tiene preguntas, sugerencias o quiere saber las opiniones de otros, Ud está bienvenido al &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;foro&lt;/a&gt; de GoldenDict. &lt;p&gt;Visite el &lt;a href=&quot;http://goldendict.org/&quot;&gt;sitio web&lt;/a&gt; para conseguir actualizaciones del programa. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licenciado bajo los términos de la GPLv3 o después.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Utilizando la ventana emergente</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Cómo Utilizar la ventana emergente&lt;/h3&gt;Para buscar palabras desde otras aplicaciones activas, primero hay que habilitar la opción &lt;i&gt;&quot;Escaneo en una ventana emergente&quot;&lt;/i&gt; en &lt;b&gt;Editar|Preferencias&lt;/b&gt;. Luego puede utilizarla en cualquier momento, activando el icono arriba de la &apos;Ventana Emergente&apos;. Alternativamente, haga clic a derecha abajo en la bandeja del sistema y seleccione la opción &lt;b&gt;Escanear con Ventana Emergente&lt;/b&gt; en el menú.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Luego detenga el cursor sobre la palabra que Ud. quiere buscar en otra aplicación y una ventana emergente aparecerá para hacer la consulta.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Luego, seleccione una palabra deseada con su ratón para buscarla desde otra aplicación. Para seleccionar una palabra haga doble clic o arrastra sobre la palabra mientras oprimiendo el botón del ratón, y una ventana emergente aparecerá con la definición de la palabra.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(sin título)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -120,7 +120,7 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>De </translation>
     </message>
@@ -129,32 +129,32 @@
         <translation type="obsolete">From %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Error de búsqueda: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Cerrar palabras:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Expresiones compuestas:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Palabras individuales:</translation>
     </message>
@@ -162,47 +162,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,99 +211,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>El recurso referido no existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Abrir enlace</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Abrir enlace en una nueva &amp;pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Abrir enlace en un &amp;navegador web externo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Buscar &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Buscar &quot;%1&quot; en una &amp;nueva pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Buscar &quot;%1&quot; en %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Buscar &quot;%1&quot; en %2 en una &amp;nueva pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -316,37 +317,37 @@
         <translation type="obsolete">Para activar reproducción de archivos no WAV, por favor vaya a Editar|Preferencias, escoja la pestaña Audio y seleccione &quot;Reproducir con DirectShow&quot;.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Fallo ejecutando un reproductor para reproducir el archivo de audio: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Fallo creando archivo temporal.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Fallo abriendo automáticamente el archivo de recursos. Intente abrirlo manualmente: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>El recurso ha fallado de descargar.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation type="unfinished">ADVERTENCIA: %1</translation>
     </message>
@@ -356,42 +357,44 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>Acerca de: espacio en blanco</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Buscar:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Anterior</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Siguiente</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;MAYÚSCULAS/minúsculas</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -416,6 +419,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Contraseña:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -516,6 +542,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -558,6 +697,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -573,6 +722,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Habilitado</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Dirección</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -594,17 +811,22 @@
         <translation>Modificar este grupo</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,39 +834,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Fuentes</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Diccionarios</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Fuentes modificados</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Algunos fuentes fueron cambiados. ¿Quieres aceptar los cambios?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -663,6 +885,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Ningún</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Ningún</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -701,6 +1009,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -740,43 +1107,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Añadir grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Asignar un nombre al grupo nuevo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Renombrar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Asignar un nombre nuevo al grupo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Eliminar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>¿Está seguro que quiera eliminar el grupo &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Eliminar todos los grupos</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>¿Está seguro que quiera eliminar todos los grupos?</translation>
     </message>
@@ -881,6 +1258,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Anterior</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Siguiente</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Agrandar</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Achicar</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Tamaño normal</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -911,7 +1336,7 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Sugerencias ortográficas: </translation>
     </message>
@@ -1656,7 +2081,7 @@
         <translation type="obsolete">Zulu</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfología %1</translation>
     </message>
@@ -1664,12 +2089,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -2709,7 +3134,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Error cargando los diccionarios</translation>
     </message>
@@ -2717,7 +3142,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,17 +3154,17 @@
         <translation type="obsolete">Navegación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Escanear en ventana &amp;emergente</translation>
     </message>
@@ -2748,23 +3173,23 @@
         <translation type="obsolete">Pronounce word</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Mostrar Ventana &amp;Principal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Cargando...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Saltar esta versión</translation>
     </message>
@@ -2773,22 +3198,22 @@
         <translation type="obsolete">[Sconosciuto]</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Configuración de página</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>No hay una impresora disponible. Por favor instale una.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Imprimir articulo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Guardar articulo como</translation>
     </message>
@@ -2797,12 +3222,12 @@
         <translation type="obsolete">Archivos HTML (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>No puede guardar articulo: %1</translation>
     </message>
@@ -2811,33 +3236,33 @@
         <translation type="obsolete">Error loading dictionaries</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 diccionarios, %2 artículos, %3 palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Fallo de inicializar monitoreo de teclas de acceso rápido.&lt;br&gt;Asegúrese que su XServer tiene activada la extensión RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Una nueva versión está disponible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Ahora versión &lt;b&gt;%1&lt;/b&gt; de GoldenDict está disponible para descargar.&lt;br&gt;Haga clic en &lt;b&gt;Descargar&lt;/b&gt; para ir a página de descargas.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Buscar en:</translation>
     </message>
@@ -2846,168 +3271,179 @@
         <translation type="obsolete">Mostrar Nombres en la barra de diccionarios</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar la Palabra (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Agrandar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Achicar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Tamaño normal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Agrandar Palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Achicar Palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Tamaño Normal de Palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Cerrar la pestaña actual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Cerrar todas las pestañas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Cerrar todas las pestañas excepto la actual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Buscar en:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Pestañas abiertas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(sin titulo)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3016,38 +3452,38 @@
         <translation type="obsolete">ADVERTENCIA: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3065,27 +3501,27 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferencias...</translation>
     </message>
@@ -3094,7 +3530,7 @@
         <translation type="obsolete">&amp;Sources...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
@@ -3103,163 +3539,193 @@
         <translation type="obsolete">&amp;Grupos...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historial</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Diccionarios...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation type="unfinished">F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Página de inicio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Acerca de GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Salir de la aplicación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Foro</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Cerrar a la bandeja del sistema</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimiza el programa a la bandeja del sistema</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Guardar Artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Guardar Artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Configuración de &amp;Pagina</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Vista previa de impresión</translation>
     </message>
@@ -3268,48 +3734,48 @@
         <translation type="obsolete">Reescanear Archivos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Despejar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3325,12 +3791,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3338,7 +3804,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Error leyendo XML: %1 en %2,%3</translation>
     </message>
@@ -3346,7 +3812,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Error leyendo XML: %1 en %2,%3</translation>
     </message>
@@ -3354,22 +3820,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3382,88 +3848,94 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Orden de diccionarios:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Diccionarios deshabilitados:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Información del diccionario</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Artículos en total:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Palabras en total:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Traduce de:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Traduce a:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Este diccionario consiste de los archivos:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Ajuste el orden, arrastrando y soltando los diccionarios con el ratón. Mueva diccionarios al grupo deshabilitado para desactivar su uso</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Recursivo</translation>
     </message>
@@ -3613,24 +4085,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Selecciona si el modo de escaneo está activado por defecto o no. Si está
 marcado, el programa siempre iniciará con el modo de escaneo habilitado.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3642,27 +4119,27 @@
 despues la seleccion esté hecha.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Teclas de acceso rápido</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Usar la siguiente combinación de teclas para mostrar u ocultar la ventana principal:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Usar la tecla siguiente para traducir una palabra en la porta-papeles:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Las teclas de acceso rápido están globales y funcionan desde cualquier programa o contexto mientras que GoldenDict estén ejecutando en el fondo.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Escanear con ventana emergente</translation>
     </message>
@@ -3672,7 +4149,7 @@
         <translation>GoldenDict inicia automáticamente cuando el sistema arranca.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -3688,156 +4165,156 @@
         <translation type="obsolete">Scan popup functionality</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Habilitar escaneo en una ventana emergente</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Habilitar escaneo en una ventana emergente cuando inicia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Con esto habilitado, la ventana emergente sólo aparece si todas las teclas 
 seleccionadas estén oprimidas cuando la selección de la palabra cambie.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Sólo muestra la ventana emergente cuando todas estas teclas seleccionadas sigan oprimidas:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Solo CTRL de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>CTRL de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Sola MAYÚSCULA de derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>MAYÚSCULA de derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tecla ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tecla CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Sola ALT de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>ALT de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tecla MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Sola ALT de derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>ALT de derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Solo CTRL de derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>CTRL de derecho</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Sola MAYÚSCULA de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>MAYÚSCULA de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tecla de Windows o Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Windows o Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Teclas pueden ser oprimidas después, adentro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
         <translation>Para evitar positivos falsos, las teclas sólo son monitoreadas después de la terminación de la selección adentro un tiempo limitado, que está especificado aquí.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3850,57 +4327,92 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Nota: Aparece que la extensión RECORD está rota en tu instalación de X.Org XServer. Las teclas de acceso rápido de GoldenDict probablemente no funcionan. Este problema puede ser arreglado en el servidor mismo. Por favor consulte al &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;reportaje de bug&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; y se puede entregar comentarios allí.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Pronunciación</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Pronuncia palabras automáticamente en la ventana principal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Pronunciar palabras automáticamente a escanear con la ventana emergente</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Reproducción</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3925,38 +4437,38 @@
         <translation type="obsolete">Reproducir con Phonon</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Usar cualquier programa para reproducir archivos de audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Usar el programa externo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3964,86 +4476,86 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4052,73 +4564,73 @@
         <translation type="obsolete">Program to play audio files:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Red</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Habilite está opción si Ud. quiere utilizar un 
 servidor proxy por todas las solicitudes de red del programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Utilizar servidor proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
         <translation>Habilitando esta opción bloqueará la mayoría de propagando comercial, porque no permite contenido (imágenes y marcos) que no vienen directamente del sitio utilizado. Si causa problemas con algunos sitios, deshabilite esta opción. </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>No permite la carga de contenido de otros sitios (oculta la mayoría de propaganda)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -4131,12 +4643,12 @@
 la página web para descargarla.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Verificar periódicamente si haya una nueva versión del programa</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Por defecto del sistema</translation>
     </message>
@@ -4149,32 +4661,33 @@
         <translation type="obsolete">Russian</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Por defecto</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4183,12 +4696,12 @@
         <translation type="obsolete">Reproducir con DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Cambiando la lengua</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Reinicie el programa para utilizar la lengua nueva del programa.</translation>
     </message>
@@ -4196,27 +4709,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4242,27 +4755,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation type="unfinished">Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4270,12 +4783,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4386,18 +4901,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation type="unfinished">El recurso ha fallado de descargar.</translation>
     </message>
@@ -4405,12 +4920,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Romanización hepburn de Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Romanización hepburn de Katakana</translation>
     </message>
@@ -4443,12 +4958,12 @@
         <translation type="obsolete">palabra</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation type="unfinished">Anterior</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation type="unfinished">Siguiente</translation>
     </message>
@@ -4461,32 +4976,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar la palabra (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Muestra u oculta la barra de diccionario</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Utilice esto para fijar la ventana en la pantalla, redimensionarla o gerenciarla en otra manera.</translation>
@@ -4496,11 +5011,11 @@
         <translation type="obsolete">List matches</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4513,8 +5028,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4522,17 +5037,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4540,45 +5055,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(no disponible en versión portátil)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Escoger un directorio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Confirma la eliminación</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿Elimina el directorio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿Eliminar el sitio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4601,7 +5118,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Añadir...</translation>
     </message>
@@ -4610,7 +5128,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
@@ -4679,32 +5198,32 @@
         <translation type="obsolete">Alternativamente, use %GD1251% en lugar de CP1251, %GDISO1% en lugar de ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Pronuncia directamente de  &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Este sito permite que la gente grabe y comparta pronunciaciones de palabras que pueden ser escuchadas desde GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Habilitar la pronuncia da Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Clave API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -4714,7 +5233,7 @@
 propia clave personalizada.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4743,79 +5262,89 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Códigos de lengua (separados por comas):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista de códigos de lenguas que Ud. quiere utilizar. Por Ejemplo: &quot;en, ru, es&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Una lista completa de los códigos de lenguas está disponible &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;aquí&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteración</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Transliteración rusa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Transliteración griega</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Transliteración alemana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Habilita el alfabeto romano para escribir la lengua japonesa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonés romanizado</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemas:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>El sistema más utilizado para transcribir japonés,
 basado en la fonología inglesa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4826,12 +5355,12 @@
 Todavia no implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4842,32 +5371,32 @@
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Silabario:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Silabario de Japonés Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Silabario de Japonés Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -5011,22 +5540,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5034,7 +5563,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Fallo buscando en algunos diccionarios.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/es_ES.ts goldendict-1.5.0~git20150923/locale/es_ES.ts
--- goldendict-1.5.0~git20131003/locale/es_ES.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/es_ES.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Desconocido]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Basado en Qt %1 (%2, %3 bits)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Desplegar artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Plegar artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>No se ha encontrado ninguna traducción para &lt;b&gt;%1&lt;/b&gt; en el grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>No se ha encontrado ninguna traducción en el grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;¡Bienvenido a &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Para empezar a trabajar con este programa, vaya primero a &lt;b&gt;Editar|Diccionarios&lt;/b&gt; para especificar los directorios para los ficheros de diccionarios, configurar varios sitios de Wikipedia o de otras fuentes, definir el orden de búsqueda en los diccionarios o crear grupos de diccionarios.&lt;p&gt;Y con eso, ¡ya está listo para buscar! Puede hacerlo en esta ventana en el panel a la izquierda o puede &lt;a href=&quot;Utilización de la ventana emergente&quot;&gt;buscar palabras desde otros programas&lt;/a&gt;. &lt;p&gt;Para personalizar el programa, eche un vistazo a las opciones disponibles en &lt;b&gt;Editar|Preferencias&lt;/b&gt;. Cada opción tiene su propia descripción, léalas si tiene cualquier duda.&lt;p&gt;Si necesita  más ayuda, tiene cualquier duda o sugerencia, o simplemente le interesa la opinión de los demás, es bienvenido al &lt;a href=&quot;http://goldendict.berlios.de/forum/&quot;&gt;foro&lt;/a&gt; del programa.&lt;p&gt;Consulte el &lt;a href=&quot;http://goldendict.org/&quot;&gt;sitio web&lt;/a&gt; del programa para estar al corriente de las actualizaciones.&lt;p&gt;© 2008-2013 Konstantin Isakov. Licencia GNU GPLv3 o posterior.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Utilización de la ventana emergente</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Utilización de la ventana emergente&lt;/h3&gt;Para buscar palabras desde otras aplicaciones, tiene que activar antes la &lt;i&gt;&quot;función de ventana emergente de búsqueda&quot;&lt;/i&gt; en &lt;b&gt;Preferencias&lt;/b&gt;, y entonces activar la ventana en cualquier momento con el icono &apos;Ventana emergente&apos; mostrado arriba, o pulsando el icono de la bandeja mostrado abajo con el botón derecho del ratón y eligiendo la opción en el menú que aparece.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Entonces puede situar el cursor sobre la palabra que quiere buscar en otra aplicación, y aparecerá una ventana mostrando los resultados de la búsqueda.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Entonces puede seleccionar cualquier palabra que quiera buscar en otra aplicación con el ratón (haga doble clic o selecciónela con el ratón mientras mantiene pulsado el botón derecho), y aparecerá una ventana que mostrará los resultados de la búsqueda..</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(sin título)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(imagen)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Desplegar artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Plegar artículo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Error de consulta: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Palabras parecidas: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Expresiones compuestas: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Palabras sueltas: </translation>
     </message>
@@ -143,47 +143,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Seleccionar artículo actual</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Copiar como texto</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspeccionar</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Recurso</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Voz de síntesis (TTS)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definición de diccionario &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definición: %1</translation>
     </message>
@@ -192,99 +192,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>El recurso indicado no existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>El reproductor de audio indicado no existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ERROR: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Guardar sonido</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Ficheros de sonido (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Guardar imagen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Ficheros de imagen (*.bmp *.jpg *.png *.tif);;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Abrir Enlace</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Vídeo: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Abrir Enlace en Nueva &amp;Pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Abrir Enlace en Navegador Web &amp;Externo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Buscar &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Buscar &quot;%1&quot; en &amp;Nueva Pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Enviar &quot;%1&quot; a la línea de entrada</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>Aña&amp;dir &quot;%1&quot; al historial</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Buscar &quot;%1&quot; en &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Buscar &quot;%1&quot; en &quot;%2&quot; en Nue&amp;va Pestaña</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>AVISO: Reproductor de Audio FFmpeg: %1</translation>
     </message>
@@ -297,37 +298,37 @@
         <translation type="obsolete">Para habilitar la reproducción de ficheros en formatos distintos de WAV, vaya a Editar|Preferencias, y en la pestaña Audio seleccione &quot;Reproducir con DirectShow&quot;.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>No se ha podido ejecutar un reproductor para reproducir el fichero de audio: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>No se ha podido crear un fichero temporal.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>No se ha podido abrir automáticamente el fichero de recursos, intente abrirlo manualmente: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>No se ha podido descargar el fichero de recursos indicado.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Guardar &amp;imagen...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Guardar s&amp;onido...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ATENCIÓN: %1</translation>
     </message>
@@ -337,42 +338,44 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Buscar:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>A&amp;nterior</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Siguiente</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Diferenciar entre mayúsculas y minúsculas</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>&amp;Resaltar todo</translation>
     </message>
@@ -398,6 +401,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Contraseña:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -498,6 +524,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Ficheros de texto (*.txt);;Todos los ficheros (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -540,6 +679,16 @@
         <translation>Descripción:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -556,6 +705,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Activado</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Dirección</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Icono</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -577,17 +794,22 @@
         <translation>Editar este grupo</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Información del diccionario</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Abrir directorio de diccionario</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Editar diccionario</translation>
     </message>
@@ -595,39 +817,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Fuentes</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Diccionarios</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Fuentes modificadas</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Se han modificado algunas fuentes. ¿Quiere aceptar las modificaciones?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -646,6 +868,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Ninguno</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Ninguno</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -684,6 +992,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -723,43 +1090,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Añadir grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Introduzca un nombre para el nuevo grupo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Renombrar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Introduzca un nuevo nombre para el grupo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Eliminar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>¿Esta seguro de que quiere eliminar el grupo &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Eliminar todos los grupos</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>¿Esta seguro que quiere eliminar todos los grupos?</translation>
     </message>
@@ -860,6 +1237,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Atrás</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Adelante</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Acercar</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Alejar</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Tamaño normal</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -890,12 +1315,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Sugerencias ortográficas: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfología del %1</translation>
     </message>
@@ -903,12 +1328,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -1948,7 +2373,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Error al cargar diccionarios</translation>
     </message>
@@ -1956,7 +2381,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Error en el fichero de configuración. ¿Continuar con la configuración por defecto?</translation>
     </message>
@@ -1968,78 +2393,78 @@
         <translation type="obsolete">Navegación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Ventana emergente de búsqueda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>&amp;Mostrar Ventana Principal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Cargando...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Saltarse esta versión</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Ha elegido ocultar una barra de menú. Utilice %1 para volver a mostrarla.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Configuración de Página</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>No hay ninguna impresora disponible. Por favor instale una primero.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Imprimir Artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artículo, Completo (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artículo, sólo HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Guardar Artículo Como</translation>
     </message>
@@ -2048,43 +2473,43 @@
         <translation type="obsolete">Ficheros Html (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>No se puede guardar el artículo: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 diccionarios, %2 artículos, %3 palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Se se ha podido iniciar la monitorización de teclas de acceso rápido.&lt;br&gt;Asegúrese de que su servidor X tiene activada la extensión RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Nueva Versión Disponible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>La versión &lt;b&gt;%1&lt;/b&gt; de GoldenDict está disponible para su descarga.&lt;br&gt;Pulse en &lt;b&gt;Descargar&lt;/b&gt; para ir a la página de descarga.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Buscar en:</translation>
     </message>
@@ -2097,158 +2522,169 @@
         <translation type="obsolete">Mostrar Iconos Pequeños en las Barras de Herramientas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Barra de &amp;menús</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Encontrado en los Diccionarios:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Mostrar N&amp;ombres en Barra de Diccionarios</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Mostrar &amp;Iconos Pequeños en Barras de Herramientas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navegación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Acercar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Alejar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Tamaño normal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Aumentar tamaño de palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Reducir tamaño de palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Tamaño normal de palabras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Cerrrar la pestaña actual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Cerrar todas las pestañas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Cerrar todas las pestañas excepto la actual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Buscar:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>La API de accesibilidad no está activada</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Guardando articulo...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>La ventana principal está configurada para estar siempre en primer plano.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importar historial de fichero</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Error de importación: datos incorrectos en el fichero</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Importación del historial completa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Import error:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Información de diccionarios</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Abrir directorio de diccionarios</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Editar diccionario</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Pestañas abiertas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Abrir lista de pestañas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(sin título)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2257,28 +2693,28 @@
         <translation type="obsolete">AVISO: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ocultar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Exportar historial a fichero</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Ficheros de texto (*.txt);;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Exportación del historial completa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Error de exportación:</translation>
     </message>
@@ -2288,37 +2724,42 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Fichero</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Panel de &amp;búsqueda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Panel de &amp;resultados de navegación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Panel de &amp;historial</translation>
     </message>
@@ -2327,27 +2768,27 @@
         <translation type="obsolete">&amp;Diccionarios...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferencias...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Ampliación</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historial</translation>
     </message>
@@ -2356,133 +2797,158 @@
         <translation type="obsolete">Panel de navegación de resultados</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Diccionarios...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Sitio web</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Acerca de Goldendict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Salir del programa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Foro</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Сerrar en la Bandeja del Sistema</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimiza la ventana en la bandeja del sistema</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Guardar artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Guardar artículo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Config&amp;uración de Página</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Vista Pre&amp;via</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Ree&amp;scanear ahora</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nueva Pestaña</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Siempre en primer plano</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Siempre en primer plano</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Botón de Menú</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Vista preliminar</translation>
     </message>
@@ -2491,48 +2957,48 @@
         <translation type="obsolete">Reescanear ficheros</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Borrar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nueva Pestaña</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Carpeta de configuración</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>Mo&amp;strar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
@@ -2544,12 +3010,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Fichero de diccionario alterado o corrupto</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Fallo al cargar artículo de %1, motivo: %2</translation>
     </message>
@@ -2557,7 +3023,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Error de sintaxis XML: %1 en %2,%3</translation>
     </message>
@@ -2565,7 +3031,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Error de sintaxis XML: %1 en %2,%3</translation>
     </message>
@@ -2573,22 +3039,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Icono</translation>
     </message>
@@ -2601,88 +3067,94 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Orden de los diccionarios:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Diccionarios no activos (deshabilitados):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Información de diccionarios</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Número de artículos:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Número de palabras:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Idioma origen:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Idioma destino:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Ficheros que componen este diccionario:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Ajuste el orden arrastrando y soltando diccionarios. Arrastre diccionarios al grupo de no activos para deshabilitar su uso.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Ordenar por nombre</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Ordenar por lenguas</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Recursiva</translation>
     </message>
@@ -2792,14 +3264,14 @@
         <translation>Al hacer doble clic sobre una palabra ésta se traduce</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Elige si la ventana emergente de búsqueda está habilitada por defecto o no. Si se marca,
 el programa empezará siempre con la ventana emergente de búsqueda activada.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2810,27 +3282,27 @@
 pulsarse un poco después de realizar la selección.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Teclas de acceso rápido</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Use la siguiente tecla de acceso rápido para mostrar u ocultar la ventana principal:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Use la siguiente tecla de acceso rápido para traducir una palabra desde el portapapeles:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Las teclas de acceso rápido son globales y funcionan desde cualquier programa y en cualquier situación, siempre que GoldenDict se esté ejecutando en segundo plano.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Ventana emergente de búsqueda</translation>
     </message>
@@ -2882,17 +3354,22 @@
         <translation>Estilo suplementario add-on):</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Ajuste este valor para evitar menús contextuales demasiado grandes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Límite de diccionarios para el menú contextual:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2904,134 +3381,134 @@
 o desde el icono de la bandeja.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Activa la funcionalidad de ventana emergente de búsqueda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Empezar con la ventana emergente de búsqueda activada</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Al activar esta opción, la ventana emergente aparecerá si se pulsan todas
 las teclas elegidas cuando cambia la palabra seleccionada.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Mostrar la ventana emergente sólo si todas las teclas seleccionadas se mantienen pulsadas:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Sólo Ctrl izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl Izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Sólo Mayúsculas derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Mayúsculas derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tecla Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tecla Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Sólo Alt izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tecla mayúsculas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Mayúsculas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Sólo Alt derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Sólo Ctrl derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl derecha</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Sólo Shift izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Shift izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tecla Windows o tecla Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>También se pueden pulsar las teclas despues, dentro de </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3040,54 +3517,89 @@
 de segundos, que se especifica aquí.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Enviar palabra traducida a la ventana principal en lugar de mostrarla en la ventana emergente</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Enviar palabra traducida a la ventana principal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Reproducir ficheros de audio con FFmpeg(libav) y libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Utilizar reproductor interno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Algunos sitios web detectan GoldenDict mediante las cabeceras HTTP y bloquean las peticiones.
 Active esta opción para evitar el problema.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Impedir la identificación de GoldenDict a partir de las cabeceras HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>A&amp;vanzado</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Opciones avanzadas de ventana emergente de búsqueda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3098,12 +3610,12 @@
 No hace falta seleccionar esta opción si no utiliza estos programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Utilizar &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3112,12 +3624,12 @@
 No hace falta seleccionar esta opción si no utiliza estos programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Utilizar &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3126,87 +3638,87 @@
 No necesita seleccionar esta opción si no utiliza tales programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Utilizar &amp;GoldenDict message</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Activar esta opción para almacenar el historial de palabras traducidas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Almacenar &amp;historial</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Especificar el máximo número de entradas a guardar en el historial.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Tamaño máximo del historial:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervalo de tiempo para guardar el historial. Si se pone a 0, el historial se guardará sólo al terminar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Guardar cada</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artículos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Activar esta opción para desplegar siempre las partes opcionales de los artículos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Desplegar &amp;partes opcionales</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Seleccionar esta opción para mostrar plegados los artículos muy grandes </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Mostrar plegados los artículos con más de</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Los artículos con una longitud mayor que esta se mostrarán plegados</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>símbolos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3219,27 +3731,27 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Nota: parece que está utilizando una versión del servidor X de X.Org para la que no funciona la extensión RECORD. Las teclas de acceso rápido en GoldenDict seguramente no funcionarán. Esto debe arreglarse en el propio servidor. Por favor, diríjase al siguiente &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;informe de error&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; y deje un comentario si así lo desea.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аudio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Pronunciación</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Pronunciar palabras automáticamente en la ventana principal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Pronunciar palabras automáticamente en la ventana emergente de búsqueda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Reproducción</translation>
     </message>
@@ -3264,59 +3776,59 @@
         <translation type="obsolete">Reproducir con Phonon</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Utilizar cualquier programa externo para reproducir ficheros de audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Utilizar un programa externo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Red</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Activar si desea utilizar un servidor proxy
 para todos los accesos a la red del programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Utilizar un servidor proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3325,12 +3837,12 @@
 que está accediendo. Si algunos sitios web dejan de funcionar, intente desactivar esta opción.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>No permitir la descarga de contenido desde otros sitios (oculta la mayoría de los anuncios)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3339,12 +3851,12 @@
 El plugin debe estar instalado para que funcione esta opción.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Activar plugins para la web</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3356,42 +3868,43 @@
 para su descarga.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Comprobar periódicamente la existencia de nuevas versiones del programa</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Idioma por defecto del sistema</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Por defecto</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Moderno</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3400,12 +3913,12 @@
         <translation type="obsolete">Reproducir con DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Cambiando Idioma</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Vuelva a ejecutar el programa para hacer efectivo el cambio de idioma.</translation>
     </message>
@@ -3413,27 +3926,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Texto simple</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Coincidencia con prefijo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -3459,27 +3972,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Línea de comandos</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Icono</translation>
     </message>
@@ -3487,12 +4000,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Error al cargar artículo</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Error al decodificar artículo</translation>
     </message>
@@ -3603,18 +4118,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ERROR: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Error al guardar recurso:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>No se ha podido descargar recurso referenciado.</translation>
     </message>
@@ -3622,12 +4137,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji para Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji para Katakana</translation>
     </message>
@@ -3652,12 +4167,12 @@
         <translation type="obsolete">palabra</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
@@ -3670,43 +4185,43 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Enviar palabra a la ventana principal (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Muestra u oculta la barra de diccionarios</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Utilice esta opción para fijar la ventana de manera que permanezca inmóvil en la pantalla,
 se pueda redimensionar o se pueda manipular de otras maneras.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3715,8 +4230,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3724,17 +4239,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Icono</translation>
     </message>
@@ -3742,45 +4257,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Síntesis de Voz</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(no disponible en la versión portátil)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Elija un directorio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Confirmar la eliminación</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Eliminar el directorio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Eliminar el sitio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Eliminar el programa &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
@@ -3799,7 +4316,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>Añad&amp;ir...</translation>
     </message>
@@ -3808,7 +4326,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
@@ -3877,7 +4396,7 @@
         <translation type="obsolete">También puede utilizar %GD1251% para CP1251, %GDISO1% para ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programas</translation>
     </message>
@@ -3886,27 +4405,27 @@
         <translation type="obsolete">Cualquier programa externo. La cadena %GDWORD% se reemplazará por la palabra buscada. La palabra se enviará también a la entrada estándar.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Pronunciación de palabras de &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Este sitio permite a la gente grabar y compartir pronunciaciones de palabras. Puede escucharlas desde GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Activar pronunciaciones desde Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>clave de la API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3915,7 +4434,7 @@
 o regístrese en el sitio para obtener su propia clave.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Obtenga su propia clave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;aquí&lt;/a&gt;, or déjela en blanco para usar la clave por defecto.</translation>
     </message>
@@ -3945,79 +4464,89 @@
 %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% para GBK y GB18030, y %GDSHIFTJIS% para Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Se puede especificar cualquier programa externo. Se sustituirá el texto %GDWORD% por la palabra a buscar. Si este texto no está presente, se enviará la palabra a la entrada estándar.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Códigos de idioma (separados por comas):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista de códigos de lenguaje que desea. Ejemplo: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>La lista completa de códigos de lenguaje está disponible &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;aquí&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteración</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Transliteración del ruso</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Transliteración del griego</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Transliteración del alemán</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Transliteración del bielorruso</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Permite utilizar el alfabeto latino para escribir en el idioma japonés</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Romaji Japonés</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemas:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>El método más utilizado para la transcripción del japonés,
 basado en la fonología del inglés</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4028,12 +4557,12 @@
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4044,32 +4573,32 @@
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Silabarios:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Silabario japonés Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Silabario japonés Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4209,22 +4738,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Icono</translation>
     </message>
@@ -4232,7 +4761,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>No se ha podido consultar algunos diccionarios.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/fa_IR.ts goldendict-1.5.0~git20150923/locale/fa_IR.ts
--- goldendict-1.5.0~git20131003/locale/fa_IR.ts	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/fa_IR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,4650 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fa_IR">
+<context>
+    <name>About</name>
+    <message>
+        <location filename="../about.ui" line="17"/>
+        <source>About</source>
+        <translation>درباره</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="66"/>
+        <source>GoldenDict dictionary lookup program, version </source>
+        <translation>برنامه جست‌وجوگر واژه‌نامه گلدن‌دیکت، نسخه </translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="91"/>
+        <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
+        <translation>© ۲۰۰۸-۲۰۱۳ کنستانتین ایساکوف (ikm@goldendict.org)</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="101"/>
+        <source>Licensed under GNU GPLv3 or later</source>
+        <translation>تحت مجوز گنو GPLv3 یا بالاتر</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="125"/>
+        <source>Credits:</source>
+        <translation>دست اندرکاران:</translation>
+    </message>
+    <message>
+        <location filename="../about.cc" line="17"/>
+        <source>[Unknown]</source>
+        <translation>[ناشناخته]</translation>
+    </message>
+    <message>
+        <location filename="../about.cc" line="34"/>
+        <source>Based on Qt %1 (%2, %3 bit)</source>
+        <translation>برپایه‌ی کیوتی %1 (%2، %3 بیت)</translation>
+    </message>
+</context>
+<context>
+    <name>ArticleMaker</name>
+    <message>
+        <location filename="../article_maker.cc" line="153"/>
+        <source>Expand article</source>
+        <translation>گستراندن بند</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="159"/>
+        <source>Collapse article</source>
+        <translation>جمع‌کردن بند</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="188"/>
+        <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+        <translation>هیچ ترجمه‌ای برای &lt;b&gt;%1&lt;/b&gt; در گروه &lt;b&gt;%2&lt;/b&gt; یافت نشد.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="193"/>
+        <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
+        <translation>هیچ ترجمه‌ای در گروه &lt;b&gt;%1&lt;/b&gt; یافت نشد.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="241"/>
+        <source>Welcome!</source>
+        <translation>خوش آمدید!</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="243"/>
+        <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
+        <translation>&lt;h3 dir=&quot;RTL&quot; align=&quot;center&quot;&gt;به گلدن‌دیکت &lt;b&gt;خوش آمدید&lt;/b&gt;!&lt;/h3&gt;&lt;p dir=&quot;RTL&quot;&gt;برای آغاز به کار با برنامه، نخست&lt;b&gt; ویرایش|واژه‌نامه‌ها&lt;/b&gt; را ببینید. برای افزودن مسیرهای شاخه برای یافتن پرونده‌های واژه‌نامه، راه‌اندازی پایگاه‌های گوناگون ویکی‌پدیا یا دیگر منابع، ترتیب واژه‌نامه را تنظیم کنید یا گروه‌های واژه‌نامه بسازید&lt;p dir=&quot;RTL&quot;&gt;اکنون شما آماده‌اید تا واژه‌هایتان را بیابید! شما می‌توانید در قاب سمت چپ در این پنجره یا &lt;a href=&quot;Working with popup&quot;&gt;واژه‌هایتان را از دیگر پنجره‌های فعال بیابید&lt;/a&gt;. &lt;p dir=&quot;RTL&quot;&gt;برای شخصی‌سازی برنامه، ترجیحات موجود در &lt;b&gt;ویرایش|ترجیحات&lt;/b&gt; را بررسی کنید. همه تنظیمات راهنمای ابزار دارند، اگر از چیزی مطمئن نیستید آن‌ها را بخوانید.&lt;p dir=&quot;RTL&quot;&gt;اگر به راهنمایی بیش‌تری نیاز دارید یا به نظرهای دیگران علاقه‌مند هستید، بفرمایید به &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;انجمن برنامه&lt;/a&gt;.&lt;p dir=&quot;RTL&quot;&gt; برای به‌روزرسانی‌ها &lt;a href=&quot;http://goldendict.org/&quot;&gt;وب‌سایت برنامه&lt;/a&gt; را بررسی کنید.&lt;p dir=&quot;RTL&quot;&gt;© ۲۰۰۸-۲۰۱۳ کنستانتین ایساکوف. تحت لیسانس GPLv3 یا بالاتر.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="259"/>
+        <source>Working with popup</source>
+        <translation>کار با پنجره واشو</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="261"/>
+        <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
+        <translation>&lt;h3 dir=&quot;RTL&quot; align=&quot;center&quot;&gt;کار کردن با واشو&lt;/h3&gt;&lt;p dir=&quot;RTL&quot;&gt;برای یافتن واژه‌ها از دیگر پنجره‌های فعال، شما نخست باید به‌کار اندازید &lt;i&gt;«قابلیت پویش واشو»&lt;/i&gt; در &lt;b&gt;ترجیحات&lt;/b&gt;، و سپس آن را در هر زمان با کلیک نماد بالای «واشو»، یا کلیک نماد سینی سیستم با کلیک راست موش و برگزیدن در منویی که بالا آمده است به‌کار اندازید. </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="268"/>
+        <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
+        <translation>&lt;p dir=&quot;RTL&quot;&gt;سپس تنها نشان‌گر را روی واژه در برنامه دیگری که می‌خواهید بیابید نگه‌دارید، و یک پنجره واشو واژه را برای شما شرح می‌دهد.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="271"/>
+        <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
+        <translation>&lt;p dir=&quot;RTL&quot;&gt;سپس تنها هر واژه در برنامه دیگری را که می‌خواهید بیابید با موش برگزینید (دوبار کلیک یا جاروب کردن با موش با کلید فشرده شده)، و یک پنجره واشو واژه را برای شما شرح می‌دهد.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="353"/>
+        <source>(untitled)</source>
+        <translation>(بی‌عنوان)</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="367"/>
+        <source>(picture)</source>
+        <translation>(عکس)</translation>
+    </message>
+</context>
+<context>
+    <name>ArticleRequest</name>
+    <message>
+        <location filename="../article_maker.cc" line="634"/>
+        <source>Expand article</source>
+        <translation>گستراندن بند</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="637"/>
+        <source>From </source>
+        <translation>از </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="642"/>
+        <source>Collapse article</source>
+        <translation>جمع‌کردن بند</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="659"/>
+        <source>Query error: %1</source>
+        <translation>خطای جست‌وجو: %1</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="765"/>
+        <source>Close words: </source>
+        <translation>واژه‌های نزدیک: </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="836"/>
+        <source>Compound expressions: </source>
+        <translation>عبارت‌های ترکیبی: </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="864"/>
+        <source>Individual words: </source>
+        <translation>واژه‌های جداگانه: </translation>
+    </message>
+</context>
+<context>
+    <name>ArticleView</name>
+    <message>
+        <location filename="../articleview.ui" line="14"/>
+        <source>Form</source>
+        <translation>فرم</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="54"/>
+        <source>about:blank</source>
+        <translation>درباره:تهی</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="132"/>
+        <source>Find:</source>
+        <translation>یافتن:</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="142"/>
+        <source>x</source>
+        <translation>x</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
+        <source>&amp;Previous</source>
+        <translation>پ&amp;یشین</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
+        <source>&amp;Next</source>
+        <translation>&amp;پسین</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="184"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="197"/>
+        <source>Highlight &amp;all</source>
+        <translation>پررنگ گردن &amp;همه</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="220"/>
+        <source>&amp;Case Sensitive</source>
+        <translation>&amp;حساس به کوچکی و بزرگی</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="206"/>
+        <source>Select Current Article</source>
+        <translation>برگزیدن بند جاری</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="212"/>
+        <source>Copy as text</source>
+        <translation>رونوشت مانند متن</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="218"/>
+        <source>Inspect</source>
+        <translation>بازرسی کردن</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="891"/>
+        <source>Resource</source>
+        <translation>منبع</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="896"/>
+        <source>Audio</source>
+        <translation>شنیداری</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="901"/>
+        <source>TTS Voice</source>
+        <translation>گفتار TTS</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="906"/>
+        <source>Picture</source>
+        <translation>عکس</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="913"/>
+        <source>Video</source>
+        <translation>ویدیو</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="922"/>
+        <source>Video: %1</source>
+        <translation>ویدیوی: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="939"/>
+        <source>Definition from dictionary &quot;%1&quot;: %2</source>
+        <translation>تعریف از واژه‌نامه &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="943"/>
+        <source>Definition: %1</source>
+        <translation>تعریف: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
+        <source>The referenced resource doesn&apos;t exist.</source>
+        <translation>منبع ارجاع شده وجود ندارد.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1198"/>
+        <source>The referenced audio program doesn&apos;t exist.</source>
+        <translation>برنامه شنیداری ارجاع شده وجود ندارد.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
+        <source>ERROR: %1</source>
+        <translation>خطای: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1464"/>
+        <source>&amp;Open Link</source>
+        <translation>&amp;باز کردن پیوند</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1470"/>
+        <source>Open Link in New &amp;Tab</source>
+        <translation>باز کردن پیوند در &amp;زیانه تازه</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1477"/>
+        <source>Open Link in &amp;External Browser</source>
+        <translation>باز کردن پیوند در &amp;مرورگر بیرونی</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1492"/>
+        <source>Save &amp;image...</source>
+        <translation>ذخیره &amp;تصویر...</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1500"/>
+        <source>Save s&amp;ound...</source>
+        <translation>ذخیره آ&amp;وا...</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1519"/>
+        <source>&amp;Look up &quot;%1&quot;</source>
+        <translation>&amp;یافتن &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1527"/>
+        <source>Look up &quot;%1&quot; in &amp;New Tab</source>
+        <translation>یافتن &quot;%1&quot; در &amp;زبانه تازه</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1532"/>
+        <source>Send &quot;%1&quot; to input line</source>
+        <translation>فرستادن &quot;%1&quot; به خط ورودی</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
+        <source>&amp;Add &quot;%1&quot; to history</source>
+        <translation>&amp;افزودن &quot;%1&quot; به پیشینه</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1552"/>
+        <source>Look up &quot;%1&quot; in %2</source>
+        <translation>یافتن &quot;%1&quot; در %2</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1560"/>
+        <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
+        <translation>یافتن &quot;%1&quot; در %2 در &amp;زبانه تازه</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1704"/>
+        <source>Save sound</source>
+        <translation>ذخیره کردن آوا</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1706"/>
+        <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
+        <translation>پرونده‌های آوا (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;همه پرونده‌ها (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1719"/>
+        <source>Save image</source>
+        <translation>ذخیره کردن تصویر</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1721"/>
+        <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
+        <translation>پرونده‌های تصویر (*.bmp *.jpg *.png *.tif);;همه پرونده‌ها (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1793"/>
+        <source>Failed to run a player to play sound file: %1</source>
+        <translation>خطا در اجرای یک پخش‌کننده برای پخش پرونده آوا: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1811"/>
+        <source>Failed to create temporary file.</source>
+        <translation>ساخت پرونده موقت شکست خورد.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1822"/>
+        <source>Failed to auto-open resource file, try opening manually: %1.</source>
+        <translation>باز کردن خودکار پرونده منبع شکست خورد، تلاش کنید به‌صورت دستی بازکنید: %1.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1845"/>
+        <source>WARNING: %1</source>
+        <translation>هشدار: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1845"/>
+        <source>The referenced resource failed to download.</source>
+        <translation>بارگیری منبع ارجاع شده شکست خورد.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1852"/>
+        <source>WARNING: FFmpeg Audio Player: %1</source>
+        <translation>هشدار: پخش‌کننده شنیداری FFmpeg : %1</translation>
+    </message>
+</context>
+<context>
+    <name>BelarusianTranslit</name>
+    <message>
+        <location filename="../belarusiantranslit.cc" line="417"/>
+        <source>Belarusian transliteration from latin to cyrillic (classic orthography)</source>
+        <translation>نویسه‌گردانی بلاروسی از لاتین به سیریلیک (درست‌نویسی سنتی)</translation>
+    </message>
+    <message>
+        <location filename="../belarusiantranslit.cc" line="420"/>
+        <source>Belarusian transliteration from latin to cyrillic (school orthography)</source>
+        <translation>نویسه‌گردانی بلاروسی از لاتین به سیریلیک (درست‌نویسی آموزشی)</translation>
+    </message>
+    <message>
+        <location filename="../belarusiantranslit.cc" line="423"/>
+        <source>Belarusian transliteration (smoothes out the difference
+between classic and school orthography in cyrillic)</source>
+        <translation>نویسه‌گردانی بلاروسی (ملایم کردن تفاوت بین
+درست‌نویسی سنتی و آموزشی در سیریلیک)</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">گذرواژه:</translation>
+    </message>
+</context>
+<context>
+    <name>DictGroupWidget</name>
+    <message>
+        <location filename="../dictgroupwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>فرم</translation>
+    </message>
+    <message>
+        <location filename="../dictgroupwidget.ui" line="37"/>
+        <source>Group icon:</source>
+        <translation>نشانه گروه:</translation>
+    </message>
+    <message>
+        <location filename="../dictgroupwidget.ui" line="85"/>
+        <source>Shortcut:</source>
+        <translation>میان‌بر:</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="38"/>
+        <source>None</source>
+        <translation>هیج کدام</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="43"/>
+        <source>From file...</source>
+        <translation>از پرونده...</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="90"/>
+        <source>Choose a file to use as group icon</source>
+        <translation>یک پرونده را برای نشانه گروه برگزینید</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="92"/>
+        <source>Images</source>
+        <translation>تصویرها</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="93"/>
+        <source>All files</source>
+        <translation>همه پرونده‌ها</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="100"/>
+        <source>Error</source>
+        <translation>خطا</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="100"/>
+        <source>Can&apos;t read the specified image file.</source>
+        <translation>پرونده تصویری مشخص شده را نمی‌تواند بخواند.</translation>
+    </message>
+</context>
+<context>
+    <name>DictGroupsWidget</name>
+    <message>
+        <location filename="../groups_widgets.cc" line="590"/>
+        <location filename="../groups_widgets.cc" line="665"/>
+        <location filename="../groups_widgets.cc" line="838"/>
+        <location filename="../groups_widgets.cc" line="1013"/>
+        <source>Dictionaries: </source>
+        <translation>واژه‌نامه‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="690"/>
+        <source>Confirmation</source>
+        <translation>تایید</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="691"/>
+        <source>Are you sure you want to generate a set of groups based on language pairs?</source>
+        <translation>آیا شما از درخواست ایجاد یک مجموعه از گروه‌ها برپایه جفت‌های زبان اطمینان دارید؟</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="716"/>
+        <source>Unassigned</source>
+        <translation>واگذار نشده</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="854"/>
+        <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
+        <translation>گروه‌ها را با زبان منبع ترکیب کنید به &quot;%1-&gt;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="871"/>
+        <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
+        <translation>گروه‌ها را با زبان هدف ترکیب کنید به &quot;%1-&gt;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="889"/>
+        <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
+        <translation>گروه ترجمه دوطرفه بسازید &quot;%1-%2-%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="907"/>
+        <location filename="../groups_widgets.cc" line="926"/>
+        <source>Combine groups with &quot;%1&quot;</source>
+        <translation>گروه‌ها را ترکیب کنید با &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>شیوه جست‌وجو</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>این رکن تعیین می‌کند که رشته پالایه چگونه تفسیر شود</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>اگر به‌کار افتاده باشد برای نمادها در هنگام پالایش پذیرفته می‌شود</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>همتا بودن مورد</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>صادر کردن سرواژه‌ها به پرونده</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>صادر کردن</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>خوب</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>برای اعمال پالایه لیست سرواژه‌ها این کلید را فشار دهید</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>اعمال کردن</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>اگر به‌کار افتاده باشد هر تغییر پالایه بی‌درنگ بر روی لیست سرواژه‌ها اعمال می‌گردد</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>اعمال خودکار</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>پالایه:</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>رشته پالایه (رشته ثابت، نویسه‌های عام یا عبارت منظم)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>متن</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>نویسه‌های عام</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>RegExp</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>جمع سرواژه‌های یکتا:  %1، پالایش شده: %2</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>ذخیره سرواژه‌ها در پرونده</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>پرونده‌های متنی (*.txt);;همه پرونده‌ها (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>صادر کردن سرواژه‌ها...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>لغو</translation>
+    </message>
+</context>
+<context>
+    <name>DictInfo</name>
+    <message>
+        <location filename="../dictinfo.ui" line="29"/>
+        <source>Total articles:</source>
+        <translation>مجموع بندها:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="46"/>
+        <source>Translates from:</source>
+        <translation>ترجمه از:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="60"/>
+        <source>Total words:</source>
+        <translation>مجموع واژه‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="77"/>
+        <source>Translates to:</source>
+        <translation>ترجمه به:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="91"/>
+        <source>Open folder</source>
+        <translation>بازکردن پوشه</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="110"/>
+        <source>Edit dictionary</source>
+        <translation>ویرایش واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="120"/>
+        <source>Files comprising this dictionary:</source>
+        <translation>پرونده‌های دربرگیرنده این واژه‌نامه:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="201"/>
+        <source>Description:</source>
+        <translation>شرح:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>همه سرواژه‌های واژه‌نامه یکتا را نشان بده</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>سرواژه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.cc" line="29"/>
+        <source>Edit the dictionary via command:
+%1</source>
+        <translation>ویرایش واژه‌نامه با دستور: %1</translation>
+    </message>
+</context>
+<context>
+    <name>DictListModel</name>
+    <message>
+        <location filename="../groups_widgets.cc" line="233"/>
+        <source>%1 entries</source>
+        <translation>%1 ورودی</translation>
+    </message>
+</context>
+<context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">به‌کار افتاده</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">نام</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">آدرس</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">نشانه</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictionaryBar</name>
+    <message>
+        <location filename="../dictionarybar.cc" line="15"/>
+        <source>&amp;Dictionary Bar</source>
+        <translation>نوار &amp;واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="25"/>
+        <source>Extended menu with all dictionaries...</source>
+        <translation>منوی گسترش یافته با همه واژه‌نامه‌ها...</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="112"/>
+        <source>Edit this group</source>
+        <translation>ویرایش این گروه</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="136"/>
+        <source>Dictionary info</source>
+        <translation>اطلاعات واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>سرواژه‌های واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
+        <source>Open dictionary folder</source>
+        <translation>بازکردن پوشه واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="150"/>
+        <source>Edit dictionary</source>
+        <translation>ویرایش واژه‌نامه</translation>
+    </message>
+</context>
+<context>
+    <name>EditDictionaries</name>
+    <message>
+        <location filename="../editdictionaries.ui" line="14"/>
+        <source>Dictionaries</source>
+        <translation>واژه‌نامه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="44"/>
+        <source>&amp;Sources</source>
+        <translation>&amp;منابع</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
+        <source>&amp;Dictionaries</source>
+        <translation>&amp;واژه‌نامه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
+        <source>&amp;Groups</source>
+        <translation>&amp;گروه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="122"/>
+        <source>Sources changed</source>
+        <translation>منابع تغییر کردند</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="123"/>
+        <source>Some sources were changed. Would you like to accept the changes?</source>
+        <translation>برخی منابع تغییر کرده‌اند. شما می‌خواهید تغییرات را بپذیرید؟</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="126"/>
+        <source>Accept</source>
+        <translation>پذیرش</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="128"/>
+        <source>Cancel</source>
+        <translation>لغو</translation>
+    </message>
+</context>
+<context>
+    <name>ExternalViewer</name>
+    <message>
+        <location filename="../externalviewer.cc" line="54"/>
+        <source>the viewer program name is empty</source>
+        <translation>نام برنامه نمایش‌گر تهی است</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished">نویسه‌های عام</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished">RegExp</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Forvo::ForvoArticleRequest</name>
+    <message>
+        <location filename="../forvo.cc" line="224"/>
+        <source>XML parse error: %1 at %2,%3</source>
+        <translation>خطای تجزیه XML: %1 در %2،%3</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="300"/>
+        <source>Added %1</source>
+        <translation>افزوده شد %1</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="303"/>
+        <source>by</source>
+        <translation>به‌وسیله</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="307"/>
+        <source>Male</source>
+        <translation>مرد</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="307"/>
+        <source>Female</source>
+        <translation>زن</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="309"/>
+        <source>from</source>
+        <translation>از</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="347"/>
+        <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
+        <translation>به ویرایش|واژه‌نامه‌ها|منابع|فوروُ بروید و کلید API مربوط به ما را بپذیرید تا این خطا ناپدید شود.</translation>
+    </message>
+</context>
+<context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished">همتا بودن مورد</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">لغو</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GermanTranslit</name>
+    <message>
+        <location filename="../german.cc" line="48"/>
+        <source>German Transliteration</source>
+        <translation>نویسه‌گردانی آلمانی</translation>
+    </message>
+</context>
+<context>
+    <name>GreekTranslit</name>
+    <message>
+        <location filename="../greektranslit.cc" line="839"/>
+        <source>Greek Transliteration</source>
+        <translation>نویسه‌گردانی یونانی</translation>
+    </message>
+</context>
+<context>
+    <name>GroupComboBox</name>
+    <message>
+        <location filename="../groupcombobox.cc" line="14"/>
+        <source>Choose a Group (Alt+G)</source>
+        <translation>یک گروه برگزینید (Alt+G)</translation>
+    </message>
+</context>
+<context>
+    <name>GroupSelectorWidget</name>
+    <message>
+        <location filename="../groupselectorwidget.ui" line="13"/>
+        <source>Form</source>
+        <translation>فرم</translation>
+    </message>
+    <message>
+        <location filename="../groupselectorwidget.ui" line="19"/>
+        <source>Look in</source>
+        <translation>جست‌وجو در</translation>
+    </message>
+</context>
+<context>
+    <name>Groups</name>
+    <message>
+        <location filename="../groups.ui" line="22"/>
+        <source>Dictionaries available:</source>
+        <translation>واژه‌نامه‌های در دست‌رس:</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="64"/>
+        <source>Add selected dictionaries to group (Ins)</source>
+        <translation>افزودن واژه‌نامه‌های برگزیده شده به گروه (درج)</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="67"/>
+        <source>&gt;</source>
+        <translation>&gt;</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="70"/>
+        <source>Ins</source>
+        <translation>درج</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="89"/>
+        <source>Remove selected dictionaries from group (Del)</source>
+        <translation>حذف واژه‌نامه‌های برگزیده شده از گروه (حذف)</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="92"/>
+        <source>&lt;</source>
+        <translation>&lt;</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="95"/>
+        <source>Del</source>
+        <translation>حذف</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="119"/>
+        <source>Groups:</source>
+        <translation>گروه‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="133"/>
+        <source>Tab 2</source>
+        <translation>زبانه ۲</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="143"/>
+        <source>Create new dictionary group</source>
+        <translation>ساخت گروه واژه‌نامه تازه</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="146"/>
+        <source>&amp;Add group</source>
+        <translation>&amp;افزودن گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="153"/>
+        <source>Create language-based groups</source>
+        <translation>ساخت گروه‌های زبان-پایه</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="156"/>
+        <source>Auto groups</source>
+        <translation>گروه‌های خودکار</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="163"/>
+        <source>Rename current dictionary group</source>
+        <translation>تغییرنام گروه واژه‌نامه جاری</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="166"/>
+        <source>Re&amp;name group</source>
+        <translation>&amp;تغییرنام گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="173"/>
+        <source>Remove current dictionary group</source>
+        <translation>حذف گروه واژه‌نامه جاری</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="176"/>
+        <source>&amp;Remove group</source>
+        <translation>&amp;حذف گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="183"/>
+        <source>Remove all dictionary groups</source>
+        <translation>حذف همه گروه‌های واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="186"/>
+        <location filename="../groups.cc" line="174"/>
+        <source>Remove all groups</source>
+        <translation>حذف همه گروه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="197"/>
+        <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
+        <translation>کشیدن و &amp;رهاکردن واژه‌نامه‌ها به و از گروه‌ها، جابه‌جایی آن‌ها درون گروه‌ها، مرتب‌سازی دوباره گروه‌ها به‌وسیله موش.</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>زبانه‌های گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>لیست گروه‌ها را باز کن</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
+        <source>Add group</source>
+        <translation>افزودن گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="124"/>
+        <source>Give a name for the new group:</source>
+        <translation>یک نام برای گروه تازه بدهید:</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="149"/>
+        <source>Rename group</source>
+        <translation>تغییرنام گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="150"/>
+        <source>Give a new name for the group:</source>
+        <translation>یک نام تازه برای گروه بدهید:</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="161"/>
+        <source>Remove group</source>
+        <translation>حذف گروه</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="162"/>
+        <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation>آیا شما از حذف گروه &lt;b&gt;%1&lt;/b&gt; اطمینان دارید؟</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="175"/>
+        <source>Are you sure you want to remove all the groups?</source>
+        <translation>آیا شما از حذف همه گروه‌ها اطمینان دارید؟</translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">پس</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">پیش</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">بزرگ‌نمایی به درون</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">بزرگ‌نمایی به بیرون</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">اندازه عادی</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HistoryPaneWidget</name>
+    <message>
+        <location filename="../historypanewidget.cc" line="21"/>
+        <source>&amp;Delete Selected</source>
+        <translation>&amp;حذف برگزیده‌ها</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="30"/>
+        <source>Copy Selected</source>
+        <translation>رونوشت برگزیده‌ها</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="47"/>
+        <source>History:</source>
+        <translation>پیشینه:</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="219"/>
+        <source>%1/%2</source>
+        <translation>%1/%2</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="223"/>
+        <source>History size: %1 entries out of maximum %2</source>
+        <translation>اندازه پیشینه: %1 ورودی فراتر از بیشینه %2</translation>
+    </message>
+</context>
+<context>
+    <name>Hunspell</name>
+    <message>
+        <location filename="../hunspell.cc" line="277"/>
+        <source>Spelling suggestions: </source>
+        <translation>پیش‌نهادهای درست‌نویسی:</translation>
+    </message>
+    <message>
+        <location filename="../hunspell.cc" line="868"/>
+        <source>%1 Morphology</source>
+        <translation>%1 ریخت‌شناسی</translation>
+    </message>
+</context>
+<context>
+    <name>HunspellDictsModel</name>
+    <message>
+        <location filename="../sources.cc" line="1340"/>
+        <source>Enabled</source>
+        <translation>به‌کار افتاده</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1342"/>
+        <source>Name</source>
+        <translation>نام</translation>
+    </message>
+</context>
+<context>
+    <name>Initializing</name>
+    <message>
+        <location filename="../initializing.ui" line="22"/>
+        <source>GoldenDict - Initializing</source>
+        <translation>گلدن‌دیکت - برپاسازی</translation>
+    </message>
+    <message>
+        <location filename="../initializing.ui" line="28"/>
+        <location filename="../initializing.cc" line="30"/>
+        <source>Please wait while indexing dictionary</source>
+        <translation>لطفا تا فهرست‌سازی واژه‌نامه صبر کنید</translation>
+    </message>
+    <message>
+        <location filename="../initializing.ui" line="44"/>
+        <source>Dictionary Name</source>
+        <translation>نام واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../initializing.cc" line="21"/>
+        <source>Please wait...</source>
+        <translation>لطفا منتظر بمانید...</translation>
+    </message>
+</context>
+<context>
+    <name>Language</name>
+    <message>
+        <location filename="../language.cc" line="55"/>
+        <source>Afar</source>
+        <translation>عفری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="56"/>
+        <source>Abkhazian</source>
+        <translation>آبخازی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="57"/>
+        <source>Avestan</source>
+        <translation>اوستایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="58"/>
+        <source>Afrikaans</source>
+        <translation>آفریقایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="59"/>
+        <source>Akan</source>
+        <translation>آکانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="60"/>
+        <source>Amharic</source>
+        <translation>آمهاری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="61"/>
+        <source>Aragonese</source>
+        <translation>اراگونی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="62"/>
+        <source>Arabic</source>
+        <translation>عربی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="63"/>
+        <source>Assamese</source>
+        <translation>اسامی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="64"/>
+        <source>Avaric</source>
+        <translation>آواری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="65"/>
+        <source>Aymara</source>
+        <translation>آیماری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="66"/>
+        <source>Azerbaijani</source>
+        <translation>آذری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="67"/>
+        <source>Bashkir</source>
+        <translation>باشکیری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="68"/>
+        <source>Belarusian</source>
+        <translation>بلاروسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="69"/>
+        <source>Bulgarian</source>
+        <translation>بلغاری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="70"/>
+        <source>Bihari</source>
+        <translation>بیهاری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="71"/>
+        <source>Bislama</source>
+        <translation>بیسلامی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="72"/>
+        <source>Bambara</source>
+        <translation>بامباری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="73"/>
+        <source>Bengali</source>
+        <translation>بنگالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="74"/>
+        <source>Tibetan</source>
+        <translation>تبتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="75"/>
+        <source>Breton</source>
+        <translation>بریتونی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="76"/>
+        <source>Bosnian</source>
+        <translation>بوسنی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="77"/>
+        <source>Catalan</source>
+        <translation>کاتالانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="78"/>
+        <source>Chechen</source>
+        <translation>چچنی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="79"/>
+        <source>Chamorro</source>
+        <translation>چامورو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="80"/>
+        <source>Corsican</source>
+        <translation>کورسیکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="81"/>
+        <source>Cree</source>
+        <translation>کری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="82"/>
+        <source>Czech</source>
+        <translation>چکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="83"/>
+        <source>Church Slavic</source>
+        <translation>کلیسا اسلاوی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="84"/>
+        <source>Chuvash</source>
+        <translation>چوواشی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="85"/>
+        <source>Welsh</source>
+        <translation>ولزی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="86"/>
+        <source>Danish</source>
+        <translation>دانمارکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="87"/>
+        <source>German</source>
+        <translation>آلمانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="88"/>
+        <source>Divehi</source>
+        <translation>دایوهایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="89"/>
+        <source>Dzongkha</source>
+        <translation>زونخایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="90"/>
+        <source>Ewe</source>
+        <translation>ایوی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="91"/>
+        <source>Greek</source>
+        <translation>یونانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="92"/>
+        <source>English</source>
+        <translation>انگلیسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="93"/>
+        <source>Esperanto</source>
+        <translation>اسپرانتور</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="94"/>
+        <source>Spanish</source>
+        <translation>اسپانیایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="95"/>
+        <source>Estonian</source>
+        <translation>استونیایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="96"/>
+        <source>Basque</source>
+        <translation>باسکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="97"/>
+        <source>Persian</source>
+        <translation>فارسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="98"/>
+        <source>Fulah</source>
+        <translation>فولاهی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="99"/>
+        <source>Finnish</source>
+        <translation>فنلاندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="100"/>
+        <source>Fijian</source>
+        <translation>فیجی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="101"/>
+        <source>Faroese</source>
+        <translation>فارویی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="102"/>
+        <source>French</source>
+        <translation>فرانسوی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="103"/>
+        <source>Western Frisian</source>
+        <translation>فریزلندی غربی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="104"/>
+        <source>Irish</source>
+        <translation>ایرلندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="105"/>
+        <source>Scottish Gaelic</source>
+        <translation>اسکاتلندی بومی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="106"/>
+        <source>Galician</source>
+        <translation>گالیشی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="107"/>
+        <source>Guarani</source>
+        <translation>گورانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="108"/>
+        <source>Gujarati</source>
+        <translation>گوجراتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="109"/>
+        <source>Manx</source>
+        <translation>مانکسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="110"/>
+        <source>Hausa</source>
+        <translation>هوساوی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="111"/>
+        <source>Hebrew</source>
+        <translation>عبری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="112"/>
+        <source>Hindi</source>
+        <translation>هندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="113"/>
+        <source>Hiri Motu</source>
+        <translation>هیری موتو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="114"/>
+        <source>Croatian</source>
+        <translation>کرواتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="115"/>
+        <source>Haitian</source>
+        <translation>هایتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="116"/>
+        <source>Hungarian</source>
+        <translation>مجارستانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="117"/>
+        <source>Armenian</source>
+        <translation>ارمنی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="118"/>
+        <source>Herero</source>
+        <translation>هریرو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="119"/>
+        <source>Interlingua</source>
+        <translation>اینترلینگوا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="120"/>
+        <source>Indonesian</source>
+        <translation>اندونزیایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="121"/>
+        <source>Interlingue</source>
+        <translation>اینترلینگو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="122"/>
+        <source>Igbo</source>
+        <translation>ایگبویی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="123"/>
+        <source>Sichuan Yi</source>
+        <translation>سیچوانی یی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="124"/>
+        <source>Inupiaq</source>
+        <translation>اینوپیاک</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="125"/>
+        <source>Ido</source>
+        <translation>ایدو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="126"/>
+        <source>Icelandic</source>
+        <translation>آیسلندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="127"/>
+        <source>Italian</source>
+        <translation>ایتالیایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="128"/>
+        <source>Inuktitut</source>
+        <translation>اینوکتیتوتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="129"/>
+        <source>Japanese</source>
+        <translation>ژاپنی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="130"/>
+        <source>Javanese</source>
+        <translation>جاوایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="131"/>
+        <source>Georgian</source>
+        <translation>گرجستانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="132"/>
+        <source>Kongo</source>
+        <translation>کنگو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="133"/>
+        <source>Kikuyu</source>
+        <translation>کیکویو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="134"/>
+        <source>Kwanyama</source>
+        <translation>کاوانیامی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="135"/>
+        <source>Kazakh</source>
+        <translation>قزاقی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="136"/>
+        <source>Kalaallisut</source>
+        <translation>گرینلندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="137"/>
+        <source>Khmer</source>
+        <translation>خمیری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="138"/>
+        <source>Kannada</source>
+        <translation>کانادایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="139"/>
+        <source>Korean</source>
+        <translation>کره‌ای</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="140"/>
+        <source>Kanuri</source>
+        <translation>کانیوری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="141"/>
+        <source>Kashmiri</source>
+        <translation>کشمیری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="142"/>
+        <source>Kurdish</source>
+        <translation>کردی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="143"/>
+        <source>Komi</source>
+        <translation>کومی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="144"/>
+        <source>Cornish</source>
+        <translation>کرنیش</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="145"/>
+        <source>Kirghiz</source>
+        <translation>قرقیزی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="146"/>
+        <source>Latin</source>
+        <translation>لاتینی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="147"/>
+        <source>Luxembourgish</source>
+        <translation>لوگزامبورگی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="148"/>
+        <source>Ganda</source>
+        <translation>گاندا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="149"/>
+        <source>Limburgish</source>
+        <translation>لیمبورگی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="150"/>
+        <source>Lingala</source>
+        <translation>لینگالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="151"/>
+        <source>Lao</source>
+        <translation>لائوسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="152"/>
+        <source>Lithuanian</source>
+        <translation>لیتوانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="153"/>
+        <source>Luba-Katanga</source>
+        <translation>لوبا کاتانگا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="154"/>
+        <source>Latvian</source>
+        <translation>لاتویانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="155"/>
+        <source>Malagasy</source>
+        <translation>مالاگاسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="156"/>
+        <source>Marshallese</source>
+        <translation>مارشالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="157"/>
+        <source>Maori</source>
+        <translation>مائوری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="158"/>
+        <source>Macedonian</source>
+        <translation>مقدونی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="159"/>
+        <source>Malayalam</source>
+        <translation>مالایایی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="160"/>
+        <source>Mongolian</source>
+        <translation>مغولستانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="161"/>
+        <source>Marathi</source>
+        <translation>مهاراتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="162"/>
+        <source>Malay</source>
+        <translation>مالایا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="163"/>
+        <source>Maltese</source>
+        <translation>مالتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="164"/>
+        <source>Burmese</source>
+        <translation>برمه‌ای</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="165"/>
+        <source>Nauru</source>
+        <translation>نائورو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="166"/>
+        <source>Norwegian Bokmal</source>
+        <translation>بوکمال نروژی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="167"/>
+        <source>North Ndebele</source>
+        <translation>ندیبیلی شمال</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="168"/>
+        <source>Nepali</source>
+        <translation>نپالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="169"/>
+        <source>Ndonga</source>
+        <translation>اندونگا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="170"/>
+        <source>Dutch</source>
+        <translation>هلندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="171"/>
+        <source>Norwegian Nynorsk</source>
+        <translation>نینورسک نروژی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="172"/>
+        <source>Norwegian</source>
+        <translation>نروژی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="173"/>
+        <source>South Ndebele</source>
+        <translation>ندیبیلی جنوب</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="174"/>
+        <source>Navajo</source>
+        <translation>ناواهو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="175"/>
+        <source>Chichewa</source>
+        <translation>چیچوا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="176"/>
+        <source>Occitan</source>
+        <translation>اکیتانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="177"/>
+        <source>Ojibwa</source>
+        <translation>اجیبوا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="178"/>
+        <source>Oromo</source>
+        <translation>اورومی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="179"/>
+        <source>Oriya</source>
+        <translation>اوریا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="180"/>
+        <source>Ossetian</source>
+        <translation>قفقازی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="181"/>
+        <source>Panjabi</source>
+        <translation>پنجابی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="182"/>
+        <source>Pali</source>
+        <translation>پالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="183"/>
+        <source>Polish</source>
+        <translation>لهستانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="184"/>
+        <source>Pashto</source>
+        <translation>پشتو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="185"/>
+        <source>Portuguese</source>
+        <translation>پرتغالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="186"/>
+        <source>Quechua</source>
+        <translation>کچوا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="187"/>
+        <source>Raeto-Romance</source>
+        <translation>ریتو-رومنس</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="188"/>
+        <source>Kirundi</source>
+        <translation>کیروندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="189"/>
+        <source>Romanian</source>
+        <translation>رومانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="190"/>
+        <source>Russian</source>
+        <translation>روسی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="191"/>
+        <source>Kinyarwanda</source>
+        <translation>کینیارواندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="192"/>
+        <source>Sanskrit</source>
+        <translation>سانسکریتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="193"/>
+        <source>Sardinian</source>
+        <translation>ساردینی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="194"/>
+        <source>Sindhi</source>
+        <translation>سندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="195"/>
+        <source>Northern Sami</source>
+        <translation>سامی شمال</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="196"/>
+        <source>Sango</source>
+        <translation>سانگو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="197"/>
+        <source>Serbo-Croatian</source>
+        <translation>صربستانی- کرواتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="198"/>
+        <source>Sinhala</source>
+        <translation>سنهالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="199"/>
+        <source>Slovak</source>
+        <translation>اسلواکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="200"/>
+        <source>Slovenian</source>
+        <translation>اسلونی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="201"/>
+        <source>Samoan</source>
+        <translation>ساموی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="202"/>
+        <source>Shona</source>
+        <translation>شونا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="203"/>
+        <source>Somali</source>
+        <translation>سومالی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="204"/>
+        <source>Albanian</source>
+        <translation>آلبانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="205"/>
+        <source>Serbian</source>
+        <translation>صربستانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="206"/>
+        <source>Swati</source>
+        <translation>سواتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="207"/>
+        <source>Southern Sotho</source>
+        <translation>سوتو جنوب</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="208"/>
+        <source>Sundanese</source>
+        <translation>سوندانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="209"/>
+        <source>Swedish</source>
+        <translation>سوئدی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="210"/>
+        <source>Swahili</source>
+        <translation>سواحیلی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="211"/>
+        <source>Tamil</source>
+        <translation>تامیلی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="212"/>
+        <source>Telugu</source>
+        <translation>تیلگو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="213"/>
+        <source>Tajik</source>
+        <translation>تاجیک</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="214"/>
+        <source>Thai</source>
+        <translation>تایلندی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="215"/>
+        <source>Tigrinya</source>
+        <translation>تگرینی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="216"/>
+        <source>Turkmen</source>
+        <translation>ترکمن</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="217"/>
+        <source>Tagalog</source>
+        <translation>تاگالوگی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="218"/>
+        <source>Tswana</source>
+        <translation>تسوانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="219"/>
+        <source>Tonga</source>
+        <translation>تونگا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="220"/>
+        <source>Turkish</source>
+        <translation>ترکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="221"/>
+        <source>Tsonga</source>
+        <translation>تسونگا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="222"/>
+        <source>Tatar</source>
+        <translation>تاتاری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="223"/>
+        <source>Twi</source>
+        <translation>توی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="224"/>
+        <source>Tahitian</source>
+        <translation>تاهیتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="225"/>
+        <source>Uighur</source>
+        <translation>اویغوری</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="226"/>
+        <source>Ukrainian</source>
+        <translation>اوکراینی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="227"/>
+        <source>Urdu</source>
+        <translation>اردو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="228"/>
+        <source>Uzbek</source>
+        <translation>ازبکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="229"/>
+        <source>Venda</source>
+        <translation>ویندا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="230"/>
+        <source>Vietnamese</source>
+        <translation>ویتنامی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="231"/>
+        <source>Volapuk</source>
+        <translation>ولاپوک</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="232"/>
+        <source>Walloon</source>
+        <translation>والونی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="233"/>
+        <source>Wolof</source>
+        <translation>ولوف</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="234"/>
+        <source>Xhosa</source>
+        <translation>زوسا</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="235"/>
+        <source>Yiddish</source>
+        <translation>یدیشی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="236"/>
+        <source>Yoruba</source>
+        <translation>یوروبی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="237"/>
+        <source>Zhuang</source>
+        <translation>ژوانکی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="238"/>
+        <source>Chinese</source>
+        <translation>چینی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="239"/>
+        <source>Zulu</source>
+        <translation>زولو</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="240"/>
+        <source>Lojban</source>
+        <translation>لوجبانی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="375"/>
+        <source>Traditional Chinese</source>
+        <translation>چینی سنتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="376"/>
+        <source>Simplified Chinese</source>
+        <translation>چینی ساده</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="377"/>
+        <source>Other</source>
+        <translation>سایر</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="378"/>
+        <source>Other Simplified Chinese dialects</source>
+        <translation>چینی سایر گویش‌های ساده</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="379"/>
+        <source>Other Traditional Chinese dialects</source>
+        <translation>چینی سایر گویش‌های سنتی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="380"/>
+        <source>Other Eastern-European languages</source>
+        <translation>سایر زبان‌های اروپای شرقی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="381"/>
+        <source>Other Western-European languages</source>
+        <translation>سایر زبان‌های اروپای غربی</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="382"/>
+        <source>Other Russian languages</source>
+        <translation>روسی سایر زبان‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="383"/>
+        <source>Other Japanese languages</source>
+        <translation>ژاپنی سایر زبان‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="384"/>
+        <source>Other Baltic languages</source>
+        <translation>بالتیک سایر زبان‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="385"/>
+        <source>Other Greek languages</source>
+        <translation>یونانی سایر زبان‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="386"/>
+        <source>Other Korean dialects</source>
+        <translation>کره‌ای سایر گویش‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="387"/>
+        <source>Other Turkish dialects</source>
+        <translation>ترکی سایر گویش‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="388"/>
+        <source>Other Thai dialects</source>
+        <translation>تایلندی سایر گویش‌ها</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="389"/>
+        <source>Tamazight</source>
+        <translation>آمازیغی</translation>
+    </message>
+</context>
+<context>
+    <name>LoadDictionaries</name>
+    <message>
+        <location filename="../loaddictionaries.cc" line="266"/>
+        <source>Error loading dictionaries</source>
+        <translation>خطا در بارگیری واژه‌نامه‌ها</translation>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <location filename="../main.cc" line="214"/>
+        <source>Error in configuration file. Continue with default settings?</source>
+        <translation>خطا در پرونده پیکربندی. با تنظیمات پیش‌فرض ادامه می‌دهید؟</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="46"/>
+        <location filename="../mainwindow.cc" line="735"/>
+        <source>Welcome!</source>
+        <translation>خوش آمدید!</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="78"/>
+        <source>&amp;File</source>
+        <translation>&amp;پرونده</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="95"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;ویرایش</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="102"/>
+        <source>&amp;Help</source>
+        <translation>&amp;راهنما</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="115"/>
+        <source>&amp;View</source>
+        <translation>&amp;نما</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="119"/>
+        <source>&amp;Zoom</source>
+        <translation>&amp;بزرگ‌نمایی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="126"/>
+        <source>H&amp;istory</source>
+        <translation>پی&amp;شینه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
+        <source>&amp;Search Pane</source>
+        <translation>قاب &amp;جست‌وجو</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
+        <source>&amp;Results Navigation Pane</source>
+        <translation>قاب &amp;ناوبری نتایج</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="304"/>
+        <source>&amp;History Pane</source>
+        <translation>قاب &amp;پیشینه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="338"/>
+        <source>&amp;Dictionaries...</source>
+        <translation>&amp;واژه‌نامه‌ها...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="341"/>
+        <source>F3</source>
+        <translation>F3</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="353"/>
+        <source>&amp;Preferences...</source>
+        <translation>&amp;ترجیحات...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="356"/>
+        <source>F4</source>
+        <translation>F4</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="364"/>
+        <source>&amp;Homepage</source>
+        <translation>&amp;برگه آغازین</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="372"/>
+        <source>&amp;About</source>
+        <translation>&amp;درباره</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="375"/>
+        <source>About GoldenDict</source>
+        <translation>درباره گلدن‌دیکت</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;ترک کردن</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="386"/>
+        <source>Quit from application</source>
+        <translation>ترک کردن برنامه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="389"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="397"/>
+        <source>&amp;Forum</source>
+        <translation>&amp;انجمن</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="405"/>
+        <source>&amp;Close To Tray</source>
+        <translation>بستن به &amp;سینی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="408"/>
+        <source>Minimizes the window to tray</source>
+        <translation>کمینه کردن پنجره به سینی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="411"/>
+        <source>Ctrl+F4</source>
+        <translation>Ctrl+F4</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="423"/>
+        <source>&amp;Save Article</source>
+        <translation>&amp;ذخیره بند</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="426"/>
+        <source>Save Article</source>
+        <translation>ذخیره بند</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="429"/>
+        <source>F2</source>
+        <translation>F2</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="441"/>
+        <source>&amp;Print</source>
+        <translation>&amp;چاپ</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="444"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="452"/>
+        <source>Page Set&amp;up</source>
+        <translation>&amp;برپایی برگه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="460"/>
+        <source>Print Pre&amp;view</source>
+        <translation>&amp;پیش‌نمایش چاپ</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="468"/>
+        <source>&amp;Rescan Files</source>
+        <translation>پویش &amp;دوباره پرونده‌ها</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
+        <source>Ctrl+F5</source>
+        <translation>Ctrl+F5</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="479"/>
+        <source>&amp;Clear</source>
+        <translation>&amp;پاک کردن</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="491"/>
+        <source>&amp;New Tab</source>
+        <translation>&amp;زبانه تازه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="494"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="505"/>
+        <source>&amp;Configuration Folder</source>
+        <translation>&amp;پوشه پیکربندی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
+        <source>&amp;Show</source>
+        <translation>&amp;نمایش</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="516"/>
+        <source>Ctrl+H</source>
+        <translation>Ctrl+H</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="524"/>
+        <source>&amp;Export</source>
+        <translation>&amp;صادر کردن</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="532"/>
+        <source>&amp;Import</source>
+        <translation>&amp;وارد کردن</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="543"/>
+        <source>&amp;Always on Top</source>
+        <translation>&amp;همیشه در بالا</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="546"/>
+        <source>Always on Top</source>
+        <translation>همیشه در بالا</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="549"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
+        <source>Menu Button</source>
+        <translation>کلید منو</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="94"/>
+        <source>Show Names in Dictionary &amp;Bar</source>
+        <translation>نمایش نا&amp;م‌ها در نوار واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="95"/>
+        <source>Show Small Icons in &amp;Toolbars</source>
+        <translation>نمایش نشانه‌های &amp;کوچک در نوار ابزار</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="96"/>
+        <source>&amp;Menubar</source>
+        <translation>نوار &amp;منو</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="151"/>
+        <source>&amp;Navigation</source>
+        <translation>نا&amp;وبری</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="154"/>
+        <source>Back</source>
+        <translation>پس</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="156"/>
+        <source>Forward</source>
+        <translation>پیش</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="181"/>
+        <source>Scan Popup</source>
+        <translation>پویش واشو</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="196"/>
+        <source>Pronounce Word (Alt+S)</source>
+        <translation>بیان واژه (Alt+S)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="208"/>
+        <source>Zoom In</source>
+        <translation>بزرگ‌نمایی به درون</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="214"/>
+        <source>Zoom Out</source>
+        <translation>بزرگ‌نمایی به بیرون</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="218"/>
+        <source>Normal Size</source>
+        <translation>اندازه عادی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
+        <source>Look up in:</source>
+        <translation>یافتن در:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="299"/>
+        <source>Found in Dictionaries:</source>
+        <translation>در این واژه‌نامه‌ها یافت شد:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="329"/>
+        <source>Words Zoom In</source>
+        <translation>بزرگ‌نمایی به درون واژه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="333"/>
+        <source>Words Zoom Out</source>
+        <translation>بزرگ‌نمایی به بیرون واژه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="335"/>
+        <source>Words Normal Size</source>
+        <translation>اندازه عادی واژه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="343"/>
+        <source>Show &amp;Main Window</source>
+        <translation>&amp;نمایش پنجره اصلی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="370"/>
+        <source>Opened tabs</source>
+        <translation>زبانه‌های باز شده</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="381"/>
+        <source>Close current tab</source>
+        <translation>بستن زبانه جاری</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="391"/>
+        <source>Close all tabs</source>
+        <translation>بستن همه زبانه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="399"/>
+        <source>Close all tabs except current</source>
+        <translation>بستن همه زبانه‌ها مگر زبانه جاری</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="548"/>
+        <source>Loading...</source>
+        <translation>بارگیری...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="558"/>
+        <source>New Tab</source>
+        <translation>زبانه تازه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
+        <source>Accessibility API is not enabled</source>
+        <translation>API دست‌رسی به‌کار نیفتاده است</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>رشته‌ای که باید در واژه‌نامه‌ها جست‌وجو شود. نویسه‌های عام &apos;*&apos;، &apos;?&apos; و گروه‌هایی از نمادهای &apos;[...]&apos; مجاز هستند.
+برای یافتن نمادهای &apos;*&apos;، &apos;?&apos;، &apos;[&apos;، &apos;]&apos; به ترتیب &apos;\*&apos;، &apos;\?&apos;، &apos;\[&apos;، &apos;\]&apos; را به‌کار ببرید</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1213"/>
+        <source>%1 dictionaries, %2 articles, %3 words</source>
+        <translation>%1 واژه‌نامه، %2 بند، %3 واژه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1224"/>
+        <source>Look up:</source>
+        <translation>یافتن:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1242"/>
+        <source>All</source>
+        <translation>همه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
+        <source>Open Tabs List</source>
+        <translation>باز کردن لیست زبانه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1455"/>
+        <source>(untitled)</source>
+        <translation>(بی‌عنوان)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1669"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2781"/>
+        <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
+        <translation>برپاسازی سازوکار بازبینی کلیدهای میان‌بر شکست خورد.&lt;br&gt;مطمئن شوید که افزونه RECORD مربوط به XServer روشن شده است.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2918"/>
+        <source>New Release Available</source>
+        <translation>نسخه تازه موجود است</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2919"/>
+        <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
+        <translation>نسخه &lt;b&gt;%1&lt;/b&gt; گلدن‌دیکت برای بارگیری آماده است &lt;br&gt; برای به‌دست آوردن برگه بارگیری &lt;b&gt;بارگیری&lt;/b&gt; را کلیک کنید.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2924"/>
+        <source>Download</source>
+        <translation>بارگیری</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2925"/>
+        <source>Skip This Release</source>
+        <translation>پرش از این نسخه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
+        <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
+        <translation>شما پنهان کردن نوار منو را برگزیده‌اید. %1 را به‌کار ببرید تا دوباره نمایش داده شود.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3056"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3154"/>
+        <source>Page Setup</source>
+        <translation>برپایی برگه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3155"/>
+        <source>No printer is available. Please install one first.</source>
+        <translation>چاپ‌گری موجود نیست. لطفاً نخست یکی نصب کنید.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3173"/>
+        <source>Print Article</source>
+        <translation>چاپ بند</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3242"/>
+        <source>Article, Complete (*.html)</source>
+        <translation>بند، کامل (*.html)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3243"/>
+        <source>Article, HTML Only (*.html)</source>
+        <translation>بند HTML تنها (*.html)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3246"/>
+        <source>Save Article As</source>
+        <translation>ذخیره بند به‌عنوان</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3260"/>
+        <source>Error</source>
+        <translation>خطا</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3261"/>
+        <source>Can&apos;t save article: %1</source>
+        <translation>نمی‌تواند بند: %1 را ذخیره کند</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3298"/>
+        <source>Saving article...</source>
+        <translation>درحال ذخیره بند...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3358"/>
+        <source>The main window is set to be always on top.</source>
+        <translation>پنجره اصلی تنظیم می‌شود تا همیشه در بالا باشد.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3525"/>
+        <source>&amp;Hide</source>
+        <translation>پنهان&amp;سازی</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3551"/>
+        <source>Export history to file</source>
+        <translation>صادر کردن پیشینه به پرونده</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>پرونده‌های متنی (*.txt);;همه پرونده‌ها (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3592"/>
+        <source>History export complete</source>
+        <translation>صادر کردن پیشینه کامل شد</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3595"/>
+        <source>Export error: </source>
+        <translation>خطا در صادر کردن:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3613"/>
+        <source>Import history from file</source>
+        <translation>وارد کردن پیشینه از پرونده</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3662"/>
+        <source>Import error: invalid data in file</source>
+        <translation>خطا در وارد کردن: داده نامعتبر در پرونده</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3666"/>
+        <source>History import complete</source>
+        <translation>وارد کردن پیشینه کامل شد</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3669"/>
+        <source>Import error: </source>
+        <translation>خطا در وارد کردن:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3920"/>
+        <source>Dictionary info</source>
+        <translation>اطلاعات واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>سرواژه‌های واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
+        <source>Open dictionary folder</source>
+        <translation>باز کردن پوشه واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3932"/>
+        <source>Edit dictionary</source>
+        <translation>ویرایش واژه‌نامه</translation>
+    </message>
+</context>
+<context>
+    <name>Mdx::MdxArticleRequest</name>
+    <message>
+        <location filename="../mdx.cc" line="636"/>
+        <source>Dictionary file was tampered or corrupted</source>
+        <translation>پرونده واژه‌نامه دست‌کاری یا خراب شده است</translation>
+    </message>
+    <message>
+        <location filename="../mdx.cc" line="647"/>
+        <source>Failed loading article from %1, reason: %2</source>
+        <translation>بارگیری بند از %1 شکست خورد، دلیل: %2</translation>
+    </message>
+</context>
+<context>
+    <name>MediaWiki::MediaWikiArticleRequest</name>
+    <message>
+        <location filename="../mediawiki.cc" line="324"/>
+        <source>XML parse error: %1 at %2,%3</source>
+        <translation>خطای تجزیه XML: %1 در %2،%3</translation>
+    </message>
+</context>
+<context>
+    <name>MediaWiki::MediaWikiWordSearchRequest</name>
+    <message>
+        <location filename="../mediawiki.cc" line="192"/>
+        <source>XML parse error: %1 at %2,%3</source>
+        <translation>خطای تجزیه XML: %1 در %2،%3</translation>
+    </message>
+</context>
+<context>
+    <name>MediaWikisModel</name>
+    <message>
+        <location filename="../sources.cc" line="449"/>
+        <source>Enabled</source>
+        <translation>به‌کار افتاده</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="451"/>
+        <source>Name</source>
+        <translation>نام</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="453"/>
+        <source>Address</source>
+        <translation>آدرس</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="455"/>
+        <source>Icon</source>
+        <translation>نشانه</translation>
+    </message>
+</context>
+<context>
+    <name>OrderAndProps</name>
+    <message>
+        <location filename="../orderandprops.ui" line="14"/>
+        <source>Form</source>
+        <translation>فرم</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="37"/>
+        <source>Dictionary order:</source>
+        <translation>ترتیب واژه‌نامه‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="53"/>
+        <source>Inactive (disabled) dictionaries:</source>
+        <translation>واژه‌نامه‌های غیرفعال (از کار افتاده):</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="67"/>
+        <source>Dictionary information</source>
+        <translation>اطلاعات واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="75"/>
+        <source>Name:</source>
+        <translation>نام:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="105"/>
+        <source>Total articles:</source>
+        <translation>جمع بندها:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="112"/>
+        <source>Total words:</source>
+        <translation>جمع واژه‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="129"/>
+        <source>Translates from:</source>
+        <translation>ترجمه از:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="136"/>
+        <source>Translates to:</source>
+        <translation>ترجمه به:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="165"/>
+        <source>Description:</source>
+        <translation>شرح:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="245"/>
+        <source>Files comprising this dictionary:</source>
+        <translation>پرونده‌های دربرگیرنده این واژه‌نامه:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="325"/>
+        <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
+        <translation>با کشیدن و رها کردن آیتم‌ها ترتیب آن‌ها را تنظیم کنید. برای از کار انداختن واژه‌نامه‌ها آن‌ها را در گروه غیرفعال بیندازید.</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="253"/>
+        <source>Sort by name</source>
+        <translation>مرتب کردن با نام</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="255"/>
+        <source>Sort by languages</source>
+        <translation>مرتب کردن با زبان</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>سرواژه‌های واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PathsModel</name>
+    <message>
+        <location filename="../sources.cc" line="1122"/>
+        <source>Path</source>
+        <translation>مسیر</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1124"/>
+        <source>Recursive</source>
+        <translation>بازگشتی</translation>
+    </message>
+</context>
+<context>
+    <name>Preferences</name>
+    <message>
+        <location filename="../preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>ترجیحات</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="47"/>
+        <source>&amp;Interface</source>
+        <translation>&amp;رابط</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="53"/>
+        <source>Startup</source>
+        <translation>آغازگر</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="59"/>
+        <source>Automatically starts GoldenDict after operation system bootup.</source>
+        <translation>پس از بالا آمدن سیستم‌عامل گلدن‌دیکت به‌طور خودکار اجرا شود.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="62"/>
+        <source>Start with system</source>
+        <translation>آغاز هم‌راه با سیستم</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="74"/>
+        <source>Add-on style:</source>
+        <translation>سبک افزونه:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="99"/>
+        <source>When enabled, an icon appears in the sytem tray area which can be used
+to open main window and perform other tasks.</source>
+        <translation>هنگامی‌که به‌کار افتاده، یک نشانه در سینی سیستم نمایش داده می‌شود
+که می‌تواند برای باز کردن پنجره اصلی و انجام دیگر کارها به‌کار برده شود.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="103"/>
+        <source>Enable system tray icon</source>
+        <translation>به‌کار انداختن نشانه سینی سیستم</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="121"/>
+        <source>With this on, the application starts directly to system tray without showing
+its main window.</source>
+        <translation>با به‌کار انداختن این، برنامه هنگام آغاز بدون
+نمایش پنجره اصلی به سینی سیستم می‌رود.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="125"/>
+        <source>Start to system tray</source>
+        <translation>آغاز برنامه در سینی سیستم</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="132"/>
+        <source>With this on, an attempt to close main window would hide it instead of closing
+the application.</source>
+        <translation>با به‌کار انداختن این،هر تلاشی برای بستن پنجره
+اصلی به جای بستن برنامه آن‌را پنهان می‌کند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="136"/>
+        <source>Close to system tray</source>
+        <translation>بستن به سینی سیستم</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="146"/>
+        <source>Double-click translates the word clicked</source>
+        <translation>دوبار کلیک واژه کلیک شده را ترجمه کند</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="153"/>
+        <source>Normally, pressing ESC key moves focus to the translation line.
+With this on however, it will hide the main window.</source>
+        <translation>در حالت عادی، فشردن کلید ESC تمرکز را به خط ترجمه انتقال
+می‌دهد. با به‌کار انداختن این، باعث پنهان شدن پنجره اصلی می‌شود.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="157"/>
+        <source>ESC key hides main window</source>
+        <translation>کلید ESC پنجره اصلی را پنهان کند</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="164"/>
+        <source>Turn this option on if you want to select words by single mouse click</source>
+        <translation>اگر می‌خواهید واژه‌ها را با تک کلیک موش برگزینید این گزینه را به‌کار اندازید</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="167"/>
+        <source>Select word by single click</source>
+        <translation>برگزیدن واژه با تک کلیک</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="187"/>
+        <source>Tabbed browsing</source>
+        <translation>مرور زبانه‌ای</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="193"/>
+        <source>Normally, opening a new tab switches to it immediately.
+With this on however, new tabs will be opened without
+switching to them.</source>
+        <translation>در حالت عادی، با باز کردن یک زبانه‌ی تازه فوری به آن می‌روید.
+با فعال بودن این، زیانه‌ی تازه باز می‌شود ولی به آن نمی‌روید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="198"/>
+        <source>Open new tabs in background</source>
+        <translation>باز کردن زبانه‌های تازه در پس‌زمینه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="205"/>
+        <source>With this on, new tabs are opened just after the
+current, active one. Otherwise they are added to
+be the last ones.</source>
+        <translation>با فعال کردن ابن، زبانه‌های تازه پس از 
+زبانه فعلی فعال باز می‌شوند، وگرنه
+به‌عنوان آخرین زیانه افزوده می‌شوند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="210"/>
+        <source>Open new tabs after the current one</source>
+        <translation>باز کردن زبانه تازه پس از زبانه جاری</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="217"/>
+        <source>Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</source>
+        <translation>اگر نمی‌خواهید نوار زبانه اصلی را هنگامی‌که تنها یک زبانه باز شده دارید ببینید این را برگزینید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="220"/>
+        <source>Hide single tab</source>
+        <translation>پنهان کردن تک زبانه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="227"/>
+        <source>Ctrl-Tab navigates tabs in MRU order</source>
+        <translation>با مهار+Tab بین زبانه‌ها به ترتیب MRU جابه‌جا شوید</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="239"/>
+        <source>Interface language:</source>
+        <translation>زبان رابط کاربری:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="265"/>
+        <source>Display style:</source>
+        <translation>سبک نمایش:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
+        <source>Adjust this value to avoid huge context menus.</source>
+        <translation>برای دوری از فهرست زمینه خیلی بزرگ این مقدار را تنظیم کنید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="337"/>
+        <source>Context menu dictionaries limit:</source>
+        <translation>شمار واژه‌نامه‌های فهرست زمینه:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="380"/>
+        <source>&amp;Scan Popup</source>
+        <translation>پویش &amp;واشو</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="399"/>
+        <source>When enabled, a translation popup window would be shown each time
+you point your mouse on any word on the screen (Windows) or select
+any word with mouse (Linux). When enabled, you can switch it on and
+off from main window or tray icon.</source>
+        <translation>وقتی به‌کار افتاده، یک پنجره ترجمه واشو زمانی‌که شما با موش روی
+واژه‌ای روی نمایش‌گر اشاره کنید (ویندوز) یا واژه‌ای را با موش
+برگزینید (لینوکس) نمایش داده می‌شود. زمانی‌که به‌کار افتاده است، شما 
+می‌توانید آن‌را از پنجره اصلی یا نشانه سینی سیستم خاموش یا روشن کنید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="405"/>
+        <source>Enable scan popup functionality</source>
+        <translation>به‌کار انداختن قابلیت پویش واشو</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="417"/>
+        <source>Chooses whether the scan popup mode is on by default or not. If checked,
+the program would always start with the scan popup active.</source>
+        <translation>برگزینید که آیا حالت پویش واشو به‌طور پیش‌فرض روشن باشد یا نه. اگر
+به‌کار افتاده باشد، برنامه همیشه با فعال بودن پویش واشو آغاز می‌شود.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="421"/>
+        <source>Start with scan popup turned on</source>
+        <translation>آغاز با روشن بودن پویش واشو</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="428"/>
+        <source>With this enabled, the popup would only show up if all chosen keys are
+in the pressed state when the word selection changes.</source>
+        <translation>با به‌کار انداختن این، واشو تنها زمانی نمایش داده می‌شود که
+هنگام تغییر گزینش واژه همه کلیدهای برگزیده فشار داده شوند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="432"/>
+        <source>Only show popup when all selected keys are kept pressed:</source>
+        <translation>تنها زمانی که همه کلیدهای انتخاب شده فشار داده شده‌اند واشو را نمایش بده:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="480"/>
+        <source>Left Ctrl only</source>
+        <translation>تنها مهار چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="483"/>
+        <source>Left Ctrl</source>
+        <translation>مهار چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="490"/>
+        <source>Right Shift only</source>
+        <translation>تنها تبدیل چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="493"/>
+        <source>Right Shift</source>
+        <translation>تبدیل راست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="500"/>
+        <source>Alt key</source>
+        <translation>کلید دگرساز</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="503"/>
+        <source>Alt</source>
+        <translation>دگرساز</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="510"/>
+        <source>Ctrl key</source>
+        <translation>کلید مهار</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="513"/>
+        <source>Ctrl</source>
+        <translation>مهار</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="520"/>
+        <source>Left Alt only</source>
+        <translation>تنها دگرساز چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="523"/>
+        <source>Left Alt</source>
+        <translation>دگرساز چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="530"/>
+        <source>Shift key</source>
+        <translation>کلید تبدیل</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="533"/>
+        <source>Shift</source>
+        <translation>تبدیل</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="540"/>
+        <source>Right Alt only</source>
+        <translation>تنها دگرساز راست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="543"/>
+        <source>Right Alt</source>
+        <translation>دگرساز راست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="550"/>
+        <source>Right Ctrl only</source>
+        <translation>تنها مهار راست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="553"/>
+        <source>Right Ctrl</source>
+        <translation>مهار راست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="560"/>
+        <source>Left Shift only</source>
+        <translation>تنها تبدیل چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="563"/>
+        <source>Left Shift</source>
+        <translation>تبدیل چپ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="570"/>
+        <source>Windows key or Meta key</source>
+        <translation>کلید ویندوز یا کلید متا</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="573"/>
+        <source>Win/Meta</source>
+        <translation>ویندوز/متا</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="616"/>
+        <source>Normally, in order to activate a popup you have to
+maintain the chosen keys pressed while you select
+a word. With this enabled, the chosen keys may also
+be pressed shortly after the selection is done.</source>
+        <translation>به‌طور عادی، به منظور فعال کردن واشو شما باید هنگامی‌که یک واژه
+را برگزیده‌اید کلیدهای برگزیده شده را فشار داده شده نگه دارید.
+با به‌کار انداختن این، کلیدهای برگزیده، هم‌چنین می‌توانند
+با فاصه کوتاهی پس از انجام گزینش واژه فشار داده شوند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="622"/>
+        <source>Keys may also be pressed afterwards, within</source>
+        <translation>هم‌چنین کلیدها ممکن است فشار داده شوند پس از آن، در مدت</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="629"/>
+        <source>To avoid false positives, the keys are only monitored
+after the selection&apos;s done for a limited amount of
+seconds, which is specified here.</source>
+        <translation>برای پیش‌گیری از رخ‌داد اشتباه، کلیدها پس از
+اتمام گزینش تنها برای چند ثانیه محدود که
+در این‌جا مشخص شده است بازبینی می‌شوند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="653"/>
+        <source>secs</source>
+        <translation>ثانیه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="675"/>
+        <source>Send translated word to main window instead of to show it in popup window</source>
+        <translation>واژه ترجمه شده را به‌جای نمایش در پنجره واشو به پنجره اصلی بفرست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="678"/>
+        <source>Send translated word to main window</source>
+        <translation>واژه ترجمه شده را به پنجره اصلی بفرست</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="706"/>
+        <source>Hotkeys</source>
+        <translation>کلیدهای میان‌برها</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="725"/>
+        <source>Use the following hotkey to show or hide the main window:</source>
+        <translation>برای نمایش یا پنهان کردن پنجره اصلی میان‌برهای زیر را به‌کار ببر:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="756"/>
+        <source>Use the following hotkey to translate a word from clipboard:</source>
+        <translation>برای ترجمه یک واژه از حافظه میان‌برهای زیر را به‌کار ببر:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="803"/>
+        <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
+        <translation>کلیدهای میان‌بر سراسری هستند و تا زمانی که گلدن‌دیکت در پس‌زمینه در حال اجراست در هر برنامه و هر متنی کار می‌کنند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="813"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Note: You appear to be running an X.Org XServer release which has the RECORD extension broken. Hotkeys in GoldenDict will probably not work. This must be fixed in the server itself. Please refer to the following &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug entry&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; and leave a comment there if you like.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p dir=&quot;RTL&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;توجه: به نظر می‌رسد شما نسخه‌ای از X.Org XServer که افزونه RECORD آن خراب شده است را در حال اجرا دارید. کلیدهای میان‌بر در گلدن‌دیکت به‌خوبی کار نخواهند کرد. این بایستی در خود server درست شود. لطفاً مراجعه کنید به &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ثبت باگ&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; و اگر دوست دارید یک یادداشت آن‌جا بگذارید.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="851"/>
+        <source>&amp;Audio</source>
+        <translation>&amp;شنیداری</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="870"/>
+        <source>Pronunciation</source>
+        <translation>بیان کردن</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="876"/>
+        <source>Auto-pronounce words in main window</source>
+        <translation>بیان خودکار واژه‌ها در پنجره اصلی</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="883"/>
+        <source>Auto-pronounce words in scan popup</source>
+        <translation>بیان خودکار واژه‌ها در پویش واشو</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="893"/>
+        <source>Playback</source>
+        <translation>بازپخش</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="899"/>
+        <source>Play audio files via FFmpeg(libav) and libao</source>
+        <translation>پخش پرونده‌های شنیداری با FFmpeg(libav) و libao</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="902"/>
+        <source>Use internal player</source>
+        <translation>به‌کار بردن پخش‌کننده درونی</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="911"/>
+        <source>Use any external program to play audio files</source>
+        <translation>به‌کار بردن هر برنامه بیرونی برای پخش پرونده‌های شنیداری</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="914"/>
+        <source>Use external program:</source>
+        <translation>به‌کار بردن برنامه بیرونی:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="951"/>
+        <source>&amp;Network</source>
+        <translation>ش&amp;بکه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="970"/>
+        <source>Enable if you wish to use a proxy server
+for all program&apos;s network requests.</source>
+        <translation>اگر می‌خواهید کارگزار پروکسی را برای همه درخواست‌های
+شبکه برنامه به‌کار ببرید این را به‌کار اندازید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="974"/>
+        <source>Use proxy server</source>
+        <translation>به‌کار بردن کارگزار پروکسی</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1008"/>
+        <source>Type:</source>
+        <translation>نوع:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1018"/>
+        <source>Host:</source>
+        <translation>میزبان:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1028"/>
+        <source>Port:</source>
+        <translation>درگاه:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1049"/>
+        <source>User:</source>
+        <translation>کاربر:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1059"/>
+        <source>Password:</source>
+        <translation>گذرواژه:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1097"/>
+        <source>Enabling this would make GoldenDict block most advertisements
+by disallowing content (images, frames) not originating from the site
+you are browsing. If some site breaks because of this, try disabling this.</source>
+        <translation>با به‌کار انداختن این گلدن‌دیکت بیش‌تر آگهی‌ها را با اجازه ندادن
+به محتوای (تصویرها، قاب‌ها) که از پایگاه مروری شما نیست می‌بندد.
+اگر برخی پایگاه‌ها به خاطر این خراب شدند، این را از کار بیندازید. </translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1102"/>
+        <source>Disallow loading content from other sites (hides most advertisements)</source>
+        <translation>بارگیری محتوا از دیگر پایگاه‌ها را می‌بندد (بیش‌تر آگهی‌ها را پنهان می‌کند)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1109"/>
+        <source>Enabling this would allow to listen to sound pronunciations from
+online dictionaries that rely on Flash or other web plugins.
+Plugin must be installed for this option to work.</source>
+        <translation>با به‌کار انداختن این می‌توانید به بیان آواها از شاخه‌های
+برخط که بر روی فلش یا دیگر افزونه‌های وب تکیه کرده‌اند
+گوش کنید. برای کار کردن این گزینه افزونه باید نصب شده باشد.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1114"/>
+        <source>Enable web plugins</source>
+        <translation>به‌کار انداختن افزونه‌های وب</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1121"/>
+        <source>Some sites detect GoldenDict via HTTP headers and block the requests.
+Enable this option to workaround the problem.</source>
+        <translation>برخی پایگاه‌ها گلدن‌دیگت را از سرآیند HTTP می‌شناسند و درخواست‌ها
+را می‌بندند. این گزینه را به‌کار اندازید تا مشکل از بین برود.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1125"/>
+        <source>Do not identify GoldenDict in HTTP headers</source>
+        <translation>گلدن‌دیکت را در سرآیند HTTP نمایان نکن</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1148"/>
+        <source>When this is enabled, the program periodically
+checks if a new, updated version of GoldenDict
+is available for download. If it is so, the program
+informs the user about it and prompts to open a
+download page.</source>
+        <translation>وقتی به‌کار افتاده است، برنامه به‌طور دوره‌ای برای
+نسخه‌های تازه گلدن‌دیکت برای بارگیری بررسی می‌کند.
+اگر در دست‌رس بود برنامه کاربر را آگاه می‌کند
+و پیام می‌دهد تا یک برگه بارگیری باز کند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1155"/>
+        <source>Check for new program releases periodically</source>
+        <translation>بررسی دوره‌ای برای نسخه‌های تازه برنامه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
+        <source>Ad&amp;vanced</source>
+        <translation>&amp;پیش‌رفته</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1352"/>
+        <source>ScanPopup extra technologies</source>
+        <translation>فن‌آوری‌های فراتر پویش واشو</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1358"/>
+        <source>Try to use IAccessibleEx technology to retrieve word under cursor.
+This technology works only with some programs that support it
+ (for example Internet Explorer 9).
+It is not needed to select this option if you don&apos;t use such programs.</source>
+        <translation>تلاش می‌کند تا برای به‌دست آوردن واژه زیر نشان‌گر موش فن‌آوری IAccessibleEx را به‌کار ببرد.
+این فن‌آوری تنها با برخی برنامه‌ها که از آن پشتیبانی می‌کنند کار می‌کند (همانند IE9).
+اگر شما از این‌چنین برنامه‌هایی استفاده نمی‌کنید نیازی به برگزیدن این گزینه ندارید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1364"/>
+        <source>Use &amp;IAccessibleEx</source>
+        <translation>به‌کار بردن &amp;IAccessibleEx</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1371"/>
+        <source>Try to use UI Automation technology to retrieve word under cursor.
+This technology works only with some programs that support it.
+It is not needed to select this option if you don&apos;t use such programs.</source>
+        <translation>تلاش می‌کند تا برای به‌دست آوردن واژه زیر نشان‌گر موش فن‌آوری UIAutomation را به‌کار ببرد.
+این فن‌آوری تنها با برخی برنامه‌ها که از آن پشتیبانی می‌کنند کار می‌کند.
+اگر شما از این‌چنین برنامه‌هایی استفاده نمی‌کنید نیازی به برگزیدن این گزینه ندارید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1376"/>
+        <source>Use &amp;UIAutomation</source>
+        <translation>به‌کار بردن &amp;UIAutomation</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1383"/>
+        <source>Try to use special GoldenDict message to retrieve word under cursor.
+This technology works only with some programs that support it.
+It is not needed to select this option if you don&apos;t use such programs.</source>
+        <translation>تلاش می‌کند تا برای به‌دست آوردن واژه زیر نشان‌گر موش پیام‌ ویژه گلدن‌دیکت را به‌کار ببرد.
+این فن‌آوری تنها با برخی برنامه‌ها که از آن پشتیبانی می‌کنند کار می‌کند.
+اگر شما از این‌چنین برنامه‌هایی استفاده نمی‌کنید نیازی به برگزیدن این گزینه ندارید.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1388"/>
+        <source>Use &amp;GoldenDict message</source>
+        <translation>به‌کار بردن پیام &amp;گلدن‌دیکت</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1398"/>
+        <source>History</source>
+        <translation>پیشینه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1404"/>
+        <source>Turn this option on to store history of the translated words</source>
+        <translation>برای نگه‌داری پیشینه واژه‌های ترجمه شده این گزینه را روشن کنید</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1407"/>
+        <source>Store &amp;history</source>
+        <translation>نگه‌داری &amp;پیشینه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1422"/>
+        <source>Specify the maximum number of entries to keep in history.</source>
+        <translation>بیشینه شمار ورودی برای نگه‌داری در پیشینه را تعیین می‌کند.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1425"/>
+        <source>Maximum history size:</source>
+        <translation>بیشینه اندازه پیشینه:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1462"/>
+        <source>History saving interval. If set to 0 history will be saved only during exit.</source>
+        <translation>وقفه ذخیره پیشینه. اگر ۰ قرار داده شود پیشینه تنها هنگام ترک برنامه ذخیره خواهد شد.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1468"/>
+        <source>Save every</source>
+        <translation>ذخیره کن هر</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1485"/>
+        <source>minutes</source>
+        <translation>دقیقه</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1510"/>
+        <source>Articles</source>
+        <translation>بندها</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1516"/>
+        <source>Turn this option on to always expand optional parts of articles</source>
+        <translation>برای گستراندن همیشگی بخش‌های اختیاری بندها این گزینه را روشن کنید</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1519"/>
+        <source>Expand optional &amp;parts</source>
+        <translation>&amp;بخش‌های اختیاری را بگستران</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
+        <source>Select this option to automatic collapse big articles</source>
+        <translation>برای جمع کردن خودکار بندهای بزرگ این گزینه را برگزینید</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1531"/>
+        <source>Collapse articles more than</source>
+        <translation>بندهای بیش از این را جمع کن</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1538"/>
+        <source>Articles longer than this size will be collapsed</source>
+        <translation>بندهای کشیده‌تر از این اندازه جمع می‌شوند</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1554"/>
+        <source>symbols</source>
+        <translation>نماد</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="58"/>
+        <source>System default</source>
+        <translation>پیش‌فرض سیستم</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
+        <source>Default</source>
+        <translation>پیش‌فرض</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="140"/>
+        <source>Modern</source>
+        <translation>نوین</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="141"/>
+        <source>Lingvo</source>
+        <translation>لینگوُ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="142"/>
+        <source>Babylon</source>
+        <translation>بابیلون</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="143"/>
+        <source>Lingoes</source>
+        <translation>لینگوز</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="144"/>
+        <source>Lingoes-Blue</source>
+        <translation>لینگوز-آبی</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="552"/>
+        <source>Changing Language</source>
+        <translation>تغییر دادن زبان</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="553"/>
+        <source>Restart the program to apply the language change.</source>
+        <translation>برای به‌کار برده شدن تغییر زبان برنامه را دوباره راه‌اندازی کنید.</translation>
+    </message>
+</context>
+<context>
+    <name>ProgramTypeEditor</name>
+    <message>
+        <location filename="../sources.cc" line="1030"/>
+        <source>Audio</source>
+        <translation>شنیداری</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1032"/>
+        <source>Plain Text</source>
+        <translation>متن ساده</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1034"/>
+        <source>Html</source>
+        <translation>Html</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1036"/>
+        <source>Prefix Match</source>
+        <translation>همتا بودن پیش‌وند</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1038"/>
+        <source>Unknown</source>
+        <translation>ناشناخته</translation>
+    </message>
+</context>
+<context>
+    <name>Programs::RunInstance</name>
+    <message>
+        <location filename="../programs.cc" line="176"/>
+        <source>No program name was given.</source>
+        <translation>نام برنامه‌ای داده نشده است.</translation>
+    </message>
+    <message>
+        <location filename="../programs.cc" line="192"/>
+        <source>The program has crashed.</source>
+        <translation>برنامه خراب شده است.</translation>
+    </message>
+    <message>
+        <location filename="../programs.cc" line="195"/>
+        <source>The program has returned exit code %1.</source>
+        <translation>برنامه این کد خروج را برگردانده است %1.</translation>
+    </message>
+</context>
+<context>
+    <name>ProgramsModel</name>
+    <message>
+        <location filename="../sources.cc" line="938"/>
+        <source>Enabled</source>
+        <translation>به‌کار افتاده</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="940"/>
+        <source>Type</source>
+        <translation>نوع</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="942"/>
+        <source>Name</source>
+        <translation>نام</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="944"/>
+        <source>Command Line</source>
+        <translation>خط فرمان</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="946"/>
+        <source>Icon</source>
+        <translation>نشانه</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
+        <source>Article loading error</source>
+        <translation>خطا در بارگیری بند</translation>
+    </message>
+    <message>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
+        <source>Article decoding error</source>
+        <translation>خطا در رمزگشایی بند</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="140"/>
+        <source>avformat_alloc_context() failed.</source>
+        <translation>avformat_alloc_context() شکست خورد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="147"/>
+        <source>av_malloc() failed.</source>
+        <translation>av_malloc() شکست خورد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="156"/>
+        <source>avio_alloc_context() failed.</source>
+        <translation>avio_alloc_context() شکست خورد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="173"/>
+        <source>avformat_open_input() failed: %1.</source>
+        <translation>avformat_open_input() شکست خورد: %1.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="180"/>
+        <source>avformat_find_stream_info() failed: %1.</source>
+        <translation>avformat_find_stream_info() شکست خورد.: %1.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="195"/>
+        <source>Could not find audio stream.</source>
+        <translation>نمی‌تواند جریان شنیداری را بیابد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="203"/>
+        <source>Codec [id: %1] not found.</source>
+        <translation>کدک [شناسه: %1] یافت نشد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="210"/>
+        <source>avcodec_open2() failed: %1.</source>
+        <translation>avcodec_open2() شکست خورد: %1.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="271"/>
+        <source>Cannot find usable audio output device.</source>
+        <translation>نمی‌تواند دستگاه خروجی شنیداری به‌کار بردنی بیابد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="284"/>
+        <source>Unsupported sample format.</source>
+        <translation>قالب نمونه‌برداری پشتیبانی نشده.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="294"/>
+        <source>ao_open_live() failed: </source>
+        <translation>ao_open_live() شکست خورد: </translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="299"/>
+        <source>No driver.</source>
+        <translation>راه‌اندازی نیست.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="302"/>
+        <source>This driver is not a live output device.</source>
+        <translation>این راه‌انداز یک دستگاه خروجی زنده نیست.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="305"/>
+        <source>A valid option key has an invalid value.</source>
+        <translation>یک کلید گزینه معتبر مقدار نامعتبر دارد.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="308"/>
+        <source>Cannot open the device: %1, channels: %2, rate: %3, bits: %4.</source>
+        <translation>نمی‌تواند دستگاه: %1 را بازکند، کانال: %2، نرخ: %3، بیت: %4.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="315"/>
+        <source>Unknown error.</source>
+        <translation>خطای ناشناخته.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="340"/>
+        <source>avcodec_alloc_frame() failed.</source>
+        <translation>avcodec_alloc_frame() شکست خورد.</translation>
+    </message>
+</context>
+<context>
+    <name>QuickFilterLine</name>
+    <message>
+        <location filename="../groups_widgets.cc" line="1023"/>
+        <source>Dictionary search/filter (Ctrl+F)</source>
+        <translation>جست‌وجو/پالایه واژه‌نامه (Ctrl+F)</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="1032"/>
+        <source>Quick Search</source>
+        <translation>جست‌وجوی تند</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="1037"/>
+        <source>Clear Search</source>
+        <translation>پاک کردن جست‌وجو</translation>
+    </message>
+</context>
+<context>
+    <name>ResourceToSaveHandler</name>
+    <message>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
+        <source>ERROR: %1</source>
+        <translation>خطای: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="2637"/>
+        <source>Resource saving error: </source>
+        <translation>خطا در ذخیره منبع: </translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="2644"/>
+        <source>The referenced resource failed to download.</source>
+        <translation>بارگیری منبع ارجاع شده شکست خورد.</translation>
+    </message>
+</context>
+<context>
+    <name>Romaji</name>
+    <message>
+        <location filename="../romaji.cc" line="108"/>
+        <source>Hepburn Romaji for Hiragana</source>
+        <translation>روماجی هپ‌برن  برای هیراگانا</translation>
+    </message>
+    <message>
+        <location filename="../romaji.cc" line="117"/>
+        <source>Hepburn Romaji for Katakana</source>
+        <translation>روماجی هپ‌برن  برای کاتاکانا</translation>
+    </message>
+</context>
+<context>
+    <name>RussianTranslit</name>
+    <message>
+        <location filename="../russiantranslit.cc" line="107"/>
+        <source>Russian Transliteration</source>
+        <translation>نویسه‌گردانی روسی</translation>
+    </message>
+</context>
+<context>
+    <name>ScanPopup</name>
+    <message>
+        <location filename="../scanpopup.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>دیالوگ</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="113"/>
+        <source>Back</source>
+        <translation>پس</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="127"/>
+        <source>Forward</source>
+        <translation>پیش</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="141"/>
+        <source>Pronounce Word (Alt+S)</source>
+        <translation>بیان واژه (Alt+S)</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="151"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="161"/>
+        <source>Send word to main window (Alt+W)</source>
+        <translation>فرستادن واژه به پنجره اصلی (Alt+W)</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="171"/>
+        <source>Alt+W</source>
+        <translation>Alt+W</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="191"/>
+        <source>Shows or hides the dictionary bar</source>
+        <translation>نمایش یا پنهان کردن نوار واژه‌نامه</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="214"/>
+        <source>Use this to pin down the window so it would stay on screen,
+could be resized or managed in other ways.</source>
+        <translation>این سنجاق را فشار دهید تا پنجره روی صفحه بماند،
+می‌توان تغییر اندازه داد یا طور دیگری مدیریت کرد.</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
+</context>
+<context>
+    <name>SoundDirsModel</name>
+    <message>
+        <location filename="../sources.cc" line="1228"/>
+        <source>Path</source>
+        <translation>مسیر</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1230"/>
+        <source>Name</source>
+        <translation>نام</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1232"/>
+        <source>Icon</source>
+        <translation>نشانه</translation>
+    </message>
+</context>
+<context>
+    <name>Sources</name>
+    <message>
+        <location filename="../sources.ui" line="37"/>
+        <source>Files</source>
+        <translation>پرونده‌ها</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="43"/>
+        <source>Paths to search for the dictionary files:</source>
+        <translation>مسیرهای جست‌وجوی پرونده‌های واژه‌نامه:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="57"/>
+        <location filename="../sources.ui" line="120"/>
+        <location filename="../sources.ui" line="244"/>
+        <location filename="../sources.ui" line="303"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;افزودن...</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="64"/>
+        <location filename="../sources.ui" line="127"/>
+        <location filename="../sources.ui" line="251"/>
+        <location filename="../sources.ui" line="310"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
+        <source>&amp;Remove</source>
+        <translation>&amp;حذف کردن</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="84"/>
+        <source>Re&amp;scan now</source>
+        <translation>اکنون &amp;پویش دوباره کن</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="100"/>
+        <source>Sound Dirs</source>
+        <translation>شاخه‌های آوا</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="106"/>
+        <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
+        <translation>ساخت واژه‌نامه‌ها از دسته‌های پرونده‌های شنیداری با افزودن مسیرها در این‌جا:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="156"/>
+        <source>Morphology</source>
+        <translation>ریخت‌شناسی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="162"/>
+        <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
+        <translation>مسیر شاخه با واژه‌نامه‌های Hunspell/Myspell:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="178"/>
+        <source>&amp;Change...</source>
+        <translation>&amp;تغییر دادن...</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="187"/>
+        <source>Available morphology dictionaries:</source>
+        <translation>واژه‌نامه‌های ریخت‌شناسی موجود:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="199"/>
+        <source>Each morphology dictionary appears as a
+separate auxiliary dictionary which
+provides stem words for searches and
+spelling suggestions for mistyped words.
+Add appropriate dictionaries to the bottoms
+of the appropriate groups to use them.</source>
+        <translation>هر واژه‌نامه ریخت‌شناسی همانند واژه‌نامه
+کمکی جداگانه پدیدار می‌شود که ریشه
+واژه‌ها را برای جست‌وجو و پیش‌نهادهای
+درست‌نویسی برای واژه‌های نادرست آماده می‌کند.
+واژه‌نامه‌های مناسب را به انتهای گروه‌های
+مناسب برای به‌کار بردن آن‌ها می‌افزاید.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="224"/>
+        <source>Wikipedia</source>
+        <translation>ویکی‌پدیا</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="230"/>
+        <source>Wikipedia (MediaWiki) sites:</source>
+        <translation>پایگاه‌های ویکی‌پدیا (ویکی‌مدیا):</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="283"/>
+        <source>Websites</source>
+        <translation>پایگاه‌های وب</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="289"/>
+        <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
+        <translation>هر پایگاه وبی. یک رشته %GDWORD% با واژه درخواستی جای‌گزین می‌شود:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="334"/>
+        <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
+%GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
+        <translation>به‌نوبت، به‌کار می‌برد %GD1251% برای CP1251،و %GDISO1%...%GDISO16% برای ISO 8859-1...ISO 8859-16 را به‌ترتیب برای،
+%GDBIG5% برای Big-5، و %GDBIG5HKSCS% برای Big5-HKSCS، و %GDGBK% برای GBK و GB18030، و %GDSHIFTJIS% برای Shift-JIS.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="403"/>
+        <source>Programs</source>
+        <translation>برنامه‌ها</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
+        <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
+        <translation>هر برنامه بیرونی. یک رشته %GDWORD% با واژه درخواستی جای‌گزین می‌شود. اگر چنین رشته‌ای آماده نبود، واژه به ورودی استاندارد فرستاده می‌شود.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="462"/>
+        <source>Forvo</source>
+        <translation>فوروُ</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="474"/>
+        <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
+        <translation>بیان زنده از &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. این پایگاه به مردم اجازه ضبط و اشتراک بیان‌ها را می‌دهد. شما از گلدن‌دیکت می‌توانید به آن‌ها گوش کنید.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="487"/>
+        <source>Enable pronunciations from Forvo</source>
+        <translation>به‌کار انداختن بیان کردن با فوروُ</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="517"/>
+        <source>API Key:</source>
+        <translation>کلید API:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="524"/>
+        <source>Use of Forvo currently requires an API key. Leave this field
+blank to use the default key, which may become unavailable
+in the future, or register on the site to get your own key.</source>
+        <translation>به‌کار بردن فوروُ هم‌اکنون به یک کلید API نیاز دارد. برای به‌کار بردن
+کلید پیش‌فرض بگذارید این فیلد تهی باشد، چرا که ممکن است در آینده
+در دست‌رس نباشد، یا در پایگاه نام‌نویسی کنید تا کلید خودتان را به‌دست آورید.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="549"/>
+        <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
+        <translation>کلید خودتان را &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;از این‌جا&lt;/a&gt; به‌دست آورید، یا برای به‌کار بردن کلید پیش‌فرض بگذارید تهی باشد.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="562"/>
+        <source>Language codes (comma-separated):</source>
+        <translation>کدهای زبان (جدا شده با کاما):</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="569"/>
+        <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
+        <translation>لیست کدهای زبان که می‌خواهید داشته باشید. همانند: &quot;en, ru&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="592"/>
+        <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
+        <translation>لیست همه کدهای زبان &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;این‌جا&lt;/a&gt; در دست‌رس است.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="634"/>
+        <source>Transliteration</source>
+        <translation>نویسه‌گردانی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="655"/>
+        <source>Russian transliteration</source>
+        <translation>نویسه‌گردانی روسی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="666"/>
+        <source>Greek transliteration</source>
+        <translation>نویسه‌گردانی یونانی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="690"/>
+        <source>German transliteration</source>
+        <translation>نویسه‌گردانی آلمانی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="701"/>
+        <source>Belarusian transliteration</source>
+        <translation>نویسه‌گردانی بلاروسی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="727"/>
+        <source>Enables to use the Latin alphabet to write the Japanese language</source>
+        <translation>برای به‌کار بردن الفبای لاتین برای نوشتن زبان ژاپنی به‌کار اندازید</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="730"/>
+        <source>Japanese Romaji</source>
+        <translation>روماجی ژاپنی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="742"/>
+        <source>Systems:</source>
+        <translation>سامانه‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="749"/>
+        <source>The most widely used method of transcription of Japanese,
+based on English phonology</source>
+        <translation>پر کاربردترین روش آوانویسی ژاپنی،
+بر پایه واج‌شناسی انگلیسی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="753"/>
+        <source>Hepburn</source>
+        <translation>هپ‌برن</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="763"/>
+        <source>The most regular system, having a one-to-one relation to the
+kana writing systems. Standardized as ISO 3602
+
+Not implemented yet in GoldenDict.</source>
+        <translation>منظم‌ترین سامانه، یک رابطه یک-به-یک با سامانه‌های
+نوشتاری کانا. استاندارد شده در ISO 3602
+
+هنوز در گلدن‌دیکت پیاده‌سازی نشده است.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="769"/>
+        <source>Nihon-shiki</source>
+        <translation>نیهون-شیکی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="779"/>
+        <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
+Standardized as ISO 3602
+
+Not implemented yet in GoldenDict.</source>
+        <translation>برپایه سامانه نیهون-شیکی، ولی برای استاندارد نوین ژاپنی پیراسته شده است.
+استاندارد شده در ISO 3602
+
+هنوز در گلدن‌دیکت پیاده‌سازی نشده است.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="785"/>
+        <source>Kunrei-shiki</source>
+        <translation>کنری-شیکی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="792"/>
+        <source>Syllabaries:</source>
+        <translation>هجابندی‌ها:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="799"/>
+        <source>Hiragana Japanese syllabary</source>
+        <translation>هجابندی هیراگانای ژاپنی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="802"/>
+        <source>Hiragana</source>
+        <translation>هیراگانا</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="809"/>
+        <source>Katakana Japanese syllabary</source>
+        <translation>هجابندی کاتاکانای ژاپنی</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="812"/>
+        <source>Katakana</source>
+        <translation>کاتاکانا</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="110"/>
+        <source>Text to Speech</source>
+        <translation>متن به گفتار</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="126"/>
+        <source>(not available in portable version)</source>
+        <translation>(در نسخه قابل حمل در دست‌رس نیست)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
+        <source>Choose a directory</source>
+        <translation>یک شاخه برگزینید</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
+        <source>Confirm removal</source>
+        <translation>تایید حذف کردن</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
+        <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation>شاخه &lt;b&gt;%1&lt;/b&gt; را از لیست حذف کند؟</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
+        <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation>پایگاه &lt;b&gt;%1&lt;/b&gt; را از لیست حذف کند؟</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="317"/>
+        <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation>برنامه &lt;b&gt;%1&lt;/b&gt; را از لیست حذف کند؟</translation>
+    </message>
+</context>
+<context>
+    <name>StylesComboBox</name>
+    <message>
+        <location filename="../stylescombobox.cc" line="17"/>
+        <source>None</source>
+        <translation>هیچ کدام</translation>
+    </message>
+</context>
+<context>
+    <name>TextToSpeechSource</name>
+    <message>
+        <location filename="../texttospeechsource.ui" line="33"/>
+        <source>Selected voice engines:</source>
+        <translation>موتورهای گفتار برگزیده:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="53"/>
+        <source>&amp;Add</source>
+        <translation>&amp;افزودن</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="60"/>
+        <source>&amp;Remove</source>
+        <translation>&amp;حذف</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="84"/>
+        <source>Preferences</source>
+        <translation>ترجیحات</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="90"/>
+        <source>Volume:</source>
+        <translation>حجم:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="119"/>
+        <source>Rate:</source>
+        <translation>نرخ:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="151"/>
+        <source>Preview</source>
+        <translation>پیش‌نمایش</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="165"/>
+        <source>Available voice engines:</source>
+        <translation>موتورهای گفتار موجود:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="183"/>
+        <source>Text to be previewed:</source>
+        <translation>متن پیش‌نمایش:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="190"/>
+        <source>Type text to be previewed here.</source>
+        <translation>متن را تایپ کنید تا این‌جا پیش‌نمایش شود.</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="224"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;پیش‌نمایش</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="58"/>
+        <source>No TTS voice available</source>
+        <translation>گفتار TTS در دست‌رس نیست</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="59"/>
+        <source>Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</source>
+        <translation>نمی‌تواند گفتار TTS در دست‌رسی بیابد. &lt;br&gt; مطمئن شوید که دست‌کم یک موتور TTS روی رایانه شما نصب شده است.</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="79"/>
+        <source>Confirm removal</source>
+        <translation>تایید حذف</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="80"/>
+        <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation>حذف موتور گفتار &lt;b&gt;%1&lt;/b&gt; از لیست؟</translation>
+    </message>
+</context>
+<context>
+    <name>TranslateBox</name>
+    <message>
+        <location filename="../translatebox.cc" line="103"/>
+        <source>Type a word or phrase to search dictionaries</source>
+        <translation>یک واژه یا عبارت برای جست‌وجو در واژه‌نامه‌ها تایپ کنید</translation>
+    </message>
+    <message>
+        <location filename="../translatebox.cc" line="125"/>
+        <source>Drop-down</source>
+        <translation>پایین رفتن</translation>
+    </message>
+</context>
+<context>
+    <name>VoiceEnginesModel</name>
+    <message>
+        <location filename="../texttospeechsource.cc" line="233"/>
+        <source>Enabled</source>
+        <translation>به‌کار افتاده</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="235"/>
+        <source>Name</source>
+        <translation>نام</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="237"/>
+        <source>Id</source>
+        <translation>شناسه</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="239"/>
+        <source>Icon</source>
+        <translation>نشانه</translation>
+    </message>
+</context>
+<context>
+    <name>WebSitesModel</name>
+    <message>
+        <location filename="../sources.cc" line="606"/>
+        <source>Enabled</source>
+        <translation>به‌کار افتاده</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="608"/>
+        <source>Name</source>
+        <translation>نام</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="610"/>
+        <source>Address</source>
+        <translation>آدرس</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="612"/>
+        <source>Icon</source>
+        <translation>نشانه</translation>
+    </message>
+</context>
+<context>
+    <name>WordFinder</name>
+    <message>
+        <location filename="../wordfinder.cc" line="203"/>
+        <source>Failed to query some dictionaries.</source>
+        <translation>پرس و جوی برخی واژه‌نامه‌ها شکست خورد.</translation>
+    </message>
+</context>
+<context>
+    <name>WordList</name>
+    <message>
+        <location filename="../wordlist.cc" line="113"/>
+        <source>WARNING: %1</source>
+        <translation>هشدار: %1</translation>
+    </message>
+</context>
+</TS>
diff -Nru goldendict-1.5.0~git20131003/locale/fr_FR.ts goldendict-1.5.0~git20150923/locale/fr_FR.ts
--- goldendict-1.5.0~git20131003/locale/fr_FR.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/fr_FR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -38,7 +38,7 @@
         <translation>[Inconnu]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Basé sur Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -46,17 +46,17 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Aucune traduction pour &lt;b&gt;%1&lt;/b&gt; n&apos;a été trouvée dans le groupe &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Aucune traduction trouvée dans le groupe &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Bienvenue !</translation>
     </message>
@@ -65,17 +65,17 @@
         <translation type="obsolete">&lt;h3 align=&quot;center&quot;&gt;Bienvenue dans &lt;b&gt;GoldenDict&lt;/b&gt; !&lt;/h3&gt;&lt;p&gt;Pour commencer à utiliser le logiciel, visitez d&apos;abord &lt;b&gt;Édition|Dictionnaires&lt;/b&gt; pour ajouter des emplacements où trouver les fichiers de dictionnaires, configurer divers sites Wikipédia ou d&apos;autres sources, ajuster l&apos;ordre des dictionnaires ou créer des groupes de dictionnaires.&lt;p&gt;Vous êtes paré pour lancer de nouvelles recherches ! Vous pouvez faire cela en utilisant le panneau à gauche de cette fenêtre, ou vous pouvez &lt;a href=&quot;Working with popup&quot;&gt;chercher les mots d&apos;autres applications actives&lt;/a&gt;. &lt;p&gt;Pour personnaliser le logiciel, vérifiez les options disponibles dans &lt;b&gt;Édition|Préférences&lt;/b&gt;. Tous les paramètres y disposent d&apos;une aide, lisez-les bien en cas de doute !&lt;p&gt;Si vous avez besoin d&apos;aide, avez des questions, des suggestions ou désirez vous enquérir de l&apos;avis d&apos;autrui, vous serez les bienvenus sur le&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Visitez le &apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;site&lt;/a&gt; du logiciel pour les mises à jour. &lt;p&gt;(c) 2008-2012 Konstantin Isakov. Sous licence GPLv3 ou plus récente.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Agrandir l&apos;article</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Diminuer l&apos;article</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Bienvenue dans &lt;b&gt;GoldenDict&lt;/b&gt; !&lt;/h3&gt;
 &lt;p&gt;Pour commencer à utiliser GoldenDict, visitez d&apos;abord &lt;b&gt;Édition|Dictionnaires&lt;/b&gt; pour ajouter des emplacements où trouver les fichiers de dictionnaires, configurer des sites Wikipédia ou d&apos;autres sources, ajuster l&apos;ordre des dictionnaires ou créer des groupes de dictionnaires.&lt;p&gt;Vous êtes paré pour lancer de nouvelles recherches ! Vous pouvez faire cela en utilisant le panneau à gauche de cette fenêtre, ou vous pouvez &lt;a href=&quot;Working with popup&quot;&gt;chercher les mots à partir d&apos;autres applications actives&lt;/a&gt;.
@@ -85,32 +85,32 @@
 &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Sous licence GPLv3 ou ultérieure.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Utilisation avec pop-up</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Utilisation avec fenêtre de scan&lt;/h3&gt;Pour rechercher des mots à partir d&apos;autres applications actives, vous devez d&apos;abord activer la fonctionnalité &lt;i&gt;&quot;Fonction de scan avec fenêtre pop-up&quot;&lt;/i&gt; dans les &lt;b&gt;Préférences&lt;/b&gt;, et ensuite l&apos;activer à tout moment en cliquant sur l&apos;icône &apos;Fenêtre de scan&apos;, ou par clic droit sur l&apos;icône de la barre des tâches, puis sélection de la fonctionnalité dans le menu déroulant.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Ensuite, positionnez le curseur au-dessus du mot que vous souhaitez rechercher dans l&apos;application, et une fenêtre le décrivant apparaîtra.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Ensuite, sélectionnez avec la souris (ou double-cliquez) le mot que vous souhaitez rechercher dans l&apos;application, et une fenêtre le décrivant apparaîtra.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(sans titre)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(image)</translation>
     </message>
@@ -118,37 +118,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Agrandir l&apos;article</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>De </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Diminuer l&apos;article</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Erreur dans la requête : %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Mots se rapprochant : </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Expressions composées :</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Mots seuls :</translation>
     </message>
@@ -161,97 +161,99 @@
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Trouver :</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Précédent</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Suivant</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>Sensible à la &amp;casse</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>&amp;Tout surligner</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Sélectionner l&apos;article courant</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Copier le texte</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspecter</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Ressource</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Synthèse vocale TTS</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Image</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Vidéo : %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Définition à partir du dictionnaire &quot;%1&quot; : %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Définition : %1</translation>
     </message>
@@ -260,38 +262,39 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>La ressource référencée n&apos;existe pas.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Le programme référencé n&apos;existe pas.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ERREUR : %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Enregistrer le fichier audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Fichiers audio (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Enregistrer l&apos;image</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Fichiers image (*.bmp *.jpg *.png *.tif);;Tous les fichiers (*.*)</translation>
     </message>
@@ -300,63 +303,63 @@
         <translation type="obsolete">Erreur lors de l&apos;enregistrement de la ressource :</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Ouvrir un lien</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Ouvrir un lien dans un nouvel on&amp;glet</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Ouvrir un lien dans un navigateur &amp;externe</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Enregistrer l&apos;&amp;image...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Enregistrer le fichier audi&amp;o...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>Re&amp;chercher &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Rechercher &quot;%1&quot; dans un &amp;nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Envoyer &quot;%1&quot; dans la zone de saisie</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Ajouter &quot;%1&quot; à l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Rechercher &quot;%1&quot; dans %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Rechercher &quot;%1&quot; dans &quot;%2&quot; dans un &amp;nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>ATTENTION : lecteur audio FFmpeg : %1</translation>
     </message>
@@ -369,7 +372,7 @@
         <translation type="obsolete">Pour activer la lecture de fichiers de type autre que WAV, allez dans Édition|Préférences, choisissez l&apos;onglet Audio et sélectionnez &quot;Lire avec DirectShow&quot;.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ATTENTION : %1</translation>
     </message>
@@ -382,22 +385,22 @@
         <translation type="obsolete">La bibliothèque Bass ne peut lire ce son.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Échec de lancement d&apos;un lecteur pour lire le fichier audio %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Échec de création d&apos;un fichier temporaire.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Échec lors de l&apos;ouverture automatique du fichier de ressources, essayez d&apos;ouvrir manuellement : %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>La ressource référencée n&apos;a pas pu être téléchargée.</translation>
     </message>
@@ -422,6 +425,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>Authentification requise pour le proxy</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>Un nom d&apos;utilisateur et un mot de passe sont requis pour utiliser un proxy</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>Utilisateur :</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>Mot de passe :</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -522,6 +548,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>Mode de recherche</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>Détermine la façon dont le filtre sera interprété</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>La casse des caractères sera considérée lors du filtrage</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>Respecter la casse</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>Enregistre les vedettes dans un fichier</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>Exporter</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation>Aide</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>Appliquer</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>Applique le filtre à la liste de vedettes</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>Appliquer</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>Tous les changements de filtre seront automatiquement appliqués à la liste de vedettes</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>Appliquer automatiquement</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>Filtre :</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>Filtre (chaîne de caractères, opérateurs de cardinalité ou expression régulière)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>Texte</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>Opérateurs de cardinalité</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>Expression régulière</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>Total de vedettes uniques : %1, %2 filtrées</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>Enregistrer les vedettes dans un fichier</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>Fichiers texte (*.txt);;Tous les fichiers (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>Exporter les vedettes ...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -564,6 +703,16 @@
         <translation>Description :</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>Montrer toutes les vedettes uniques du dictionnaire</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>Vedettes</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -580,6 +729,76 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation>Adresse : </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation>Bases de données : </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation>Stratégies de recherche : </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation>Bases de données serveur</translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation>Activé</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation>Bases de données</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation>Stratégies</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation>Icône</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>Liste de bases de données, séparées par des virgules
+(une chaîne vide ou &quot;*&quot; sélectionne toutes les bases)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation>Liste de stratégies, séparées par des virgules
+(une chaîne vide impliquera une stratégie par &quot;préfixe&quot;)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -601,17 +820,22 @@
         <translation>Éditer ce groupe</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>Vedettes du dictionnaire</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Ouvrir le dossier des dictionnaires</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Éditer le dictionnaire</translation>
     </message>
@@ -624,39 +848,39 @@
         <translation>Dictionnaires</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Sources</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Dictionnaires</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Groupes</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Sources modifiées</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Certaines sources ont été modifiées. Acceptez-vous ces changements ?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -670,6 +894,93 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>Aucun</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>Recherche en texte intégral</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>Mots entiers</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>Texte intégral</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>Opérateurs de cardinalité</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>Expression régulière</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>Distance max entre les mots (%1-%2) :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>Articles max par dictionnaire (%1-%2) :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>Articles trouvés :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>En cours d&apos;indexation : </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>Les symboles CJK dans la chaîne de recherche ne sont pas compatibles avec les modes &quot;Mots entiers&quot; et &quot;Texte intégral&quot;</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translatorcomment>the source sentence is a bit weird...</translatorcomment>
+        <translation>La ligne de recherche doit contenir au moins un mot de </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation> symboles ou plus</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>Pas de dictionnaires pour la recherche en texte intégral</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>Aucun</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -708,6 +1019,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>Recherche</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>Respecter la casse</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>Mode :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>Articles trouvés :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>Dictionnaires disponibles dans le groupe :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>Indexation en cours :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>Total :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>Indexés :</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>En cours d&apos;indexation : Aucun</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation>Aide</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -838,7 +1208,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Retirer tous les groupes</translation>
     </message>
@@ -849,42 +1219,100 @@
         <translation>Glissez-déposez les dictionnaires entre les groupes, déplacez-les à l&apos;intérieur des groupes, réorganisez les groupes en utilisant votre souris.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>Grouper les onglets</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>Ouvrir la liste de groupes</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Ajouter groupe</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Nommer le nouveau groupe :</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Renommer le groupe</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Renommer le groupe :</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Retirer le groupe</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Êtes-vous sûr de vouloir enlever le groupe &lt;b&gt;%1&lt;/b&gt; ?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Êtes-vous sûr de vouloir enlever tous les groupes ?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation>Aide de GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation>Accueil</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation>Précédent</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation>Suivant</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation>Zoomer</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation>Dézoomer</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation>Taille normale</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation>Contenu</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation>Index</translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -915,12 +1343,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Orthographes suggérées :</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 Morphologie</translation>
     </message>
@@ -928,12 +1356,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -1973,7 +2401,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Erreur lors du chargement des dictionnaires</translation>
     </message>
@@ -1981,7 +2409,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Erreur dans le fichier de configuration. Continuer avec les paramètres par défaut ?</translation>
     </message>
@@ -1994,37 +2422,37 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Bienvenue !</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>Éditio&amp;n</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historique</translation>
     </message>
@@ -2037,12 +2465,12 @@
         <translation type="obsolete">Résultats</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Re&amp;chercher</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Résultats de la recherche</translation>
     </message>
@@ -2051,154 +2479,184 @@
         <translation type="obsolete">&amp;Dictionnaires...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>Recherche</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Historique</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Dictionnaires...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Préférences...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>f4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Accueil</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;À propos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>À propos de GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation>Référence de GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Quitter à partir de l&apos;application</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Réduit la fenêtre dans la barre des tâches</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Sauver l&apos;article</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Sauver l&apos;article</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>Im&amp;primer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Paramètres d&apos;&amp;impression</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>&amp;Aperçu avant impression</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Rescanner les fichiers</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Toujours au-&amp;dessus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Toujours au-dessus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Bouton du menu</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>Rechercher dans la page</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>Recherche en texte intégral</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Aperçu avant impression</translation>
     </message>
@@ -2207,48 +2665,48 @@
         <translation type="obsolete">Rescanner les fichiers</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>E&amp;ffacer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Dossier de &amp;configuration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>Affi&amp;cher</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exporter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
@@ -2261,7 +2719,7 @@
         <translation type="obsolete">Afficher des petites icônes dans les barres d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Barre du &amp;menu</translation>
     </message>
@@ -2270,138 +2728,138 @@
         <translation type="obsolete">Navigation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Afficher les noms dans la &amp;barre de dictionnaire</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Afficher de petites icônes dans les barres d&apos;ou&amp;tils</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Fenêtre de scan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Prononcer le mot (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Zoomer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Dézoomer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Taille normale</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Chercher dans :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Trouvé dans les dictionnaires :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Zoomer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Dézoomer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Taille normale</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Afficher la fenêtre &amp;principale</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Onglets ouverts</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Fermer l&apos;onglet courant</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Fermer tous les onglets</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Fermer tous les onglets sauf l&apos;onglet courant</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Chargement...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 dictionnaires, %2 articles, %3 mots</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Chercher :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Liste des onglets ouverts</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(sans titre)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2410,73 +2868,80 @@
         <translation type="obsolete">ATTENTION : %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Échec lors de l&apos;initialisation du mécanisme d&apos;écoute des raccourcis.&lt;br&gt;Vérifiez que l&apos;extension ENREGISTREMENT du serveur X est activée.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Nouvelle version disponible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>La version &lt;b&gt;%1&lt;/b&gt; de GoldenDict est disponible au téléchargement.&lt;br&gt;Cliquez sur &lt;b&gt;Télécharger&lt;/b&gt; pour accéder à la page de téléchargement.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Ignorer la version</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>L&apos;API d&apos;accessibilité n&apos;est pas activée</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>Chaîne à rechercher dans les dictionnaires. Les opérateurs de cardinalité &apos;*&apos;, &apos;?&apos; et les groupes de symboles &apos;[...]&apos; sont autorisés.
+Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos;, utiliser respectivement &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Vous avez choisi de masquer une barre de menus. Utilisez %1 pour l&apos;afficher à nouveau.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Paramètres d&apos;impression</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Aucune imprimante n&apos;est disponible. Veuillez en installer une afin de continuer.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Imprimer l&apos;article</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Article, Complet (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Article, HTML uniquement (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Enregister l&apos;article sous</translation>
     </message>
@@ -2485,27 +2950,27 @@
         <translation type="obsolete">Fichiers HTML (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Impossible d&apos;enregistrer l&apos;article : %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Sauvegarde de l&apos;article...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>La fenêtre pricipale est configurée pour être toujours au premier plan.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Masquer</translation>
     </message>
@@ -2514,28 +2979,28 @@
         <translation type="obsolete">Mode d&apos;affichage de l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Exporter l&apos;historique dans un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Fichiers texte (*.txt);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Export de l&apos;historique terminé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Erreur d&apos;export :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importer l&apos;historique à partir d&apos;un fichier</translation>
     </message>
@@ -2544,32 +3009,37 @@
         <translation type="obsolete">Importé à partir du fichier :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Erreur d&apos;import : données invalides dans le fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Import d&apos;historique terminé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Erreur d&apos;import :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>Vedettes du dictionnaire</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Ouvrir le dossier des dictionnaires</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Éditer le dictionnaire</translation>
     </message>
@@ -2577,12 +3047,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Le fichier de dictionnaire a été modifié ou corrompu</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Échec du chargement de l&apos;article à partir de %1, cause : %2</translation>
     </message>
@@ -2590,7 +3060,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Erreur de lecture XML  : %1 à la position %2,%3</translation>
     </message>
@@ -2598,7 +3068,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Erreur de lecture XML : %1 à la position %2,%3</translation>
     </message>
@@ -2606,22 +3076,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
@@ -2634,88 +3104,94 @@
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Ordre des dictionnaires :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Dictionnaires inactifs :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Articles :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Mots :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Traduit de :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Traduit vers :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Description :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Fichiers incluant ce dictionnaire :</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Définissez l&apos;ordre des éléments en les déplaçant (glisser-déposer). Déposez les dictionnaires dans le groupe &apos;inactif&apos; pour désactiver leur utilisation.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Trier par nom</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Trier par langue</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>Vedettes du dictionnaire</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation>Dictionnaires actifs : %1, inactifs : %2</translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Récursif</translation>
     </message>
@@ -2873,22 +3349,27 @@
         <translation>Style d&apos;add-on :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation>Langue de l&apos;aide</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Ajustez cette valeur pour éviter de surcharger les menus contextuels.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Limite de dictionnaires dans les menus contextuels :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>Fenêtre de &amp;scan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2899,135 +3380,135 @@
 Lorsque cette option est active, il est possible d&apos;activer/désactiver la fenêtre de scan à partir de la fenêtre principale ou de l&apos;icône de la barre des tâches.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Activer le scan par fenêtre pop-up</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Définit si la fonctionnalité de scan par fenêtre pop-up est activée par défaut ou non.
 Si cette option est active, GoldenDict démarrera toujours avec la fenêtre de scan activée.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Démarrer avec la fenêtre de scan activée</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>La pop-up n&apos;apparâit que si toutes les touches sélectionnées sont enfoncées lorsque la sélection de mot change.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Ne montrer la pop-up que lorsque les touches sélectionnées sont maintenues enfoncées :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Ctrl gauche uniquement</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl gauche</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Maj droite uniquement</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Maj droite</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Touche Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Touche Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Alt gauche uniquement</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt gauche</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Touche Maj</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Alt droite uniquement</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt droite</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Ctrl droite uniquement</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl droite</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Maj gauche uniquement</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Maj gauche</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Touche Windows ou Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3037,12 +3518,12 @@
 touches après avoir effectué la sélection.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Les touches peuvent être pressées dans un délai de</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3051,42 +3532,42 @@
 de temps limité, ici spécifié en secondes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>secondes</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Envoyer la traduction du mot vers la fenêtre principale de GoldenDict au lieu de la montrer dans une pop-up</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Envoyer la traduction du mot vers la fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Raccourcis</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Utiliser ce raccourci pour afficher ou cacher la fenêtre principale :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Utiliser ce raccourci pour traduire un mot à partir du presse-papiers :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Les raccourcis sont globaux et utilisables à partir de n&apos;importe quel programme, quel que soit le contexte, tant que GoldenDict est actif en arrière-plan.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3099,57 +3580,93 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Note : Il semble que vous utilisez une version de Xorg XServer dont la fonction RECORD est défaillante. Les raccourcis peuvent ne pas fonctionner dans GoldenDict. Cela doit être corrigé dans le serveur. Veuillez vous référer au &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;report de bug&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; et laissez un commentaire si vous le souhaitez.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Prononciation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Prononciation automatique dans la fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Prononciation automatique dans la fenêtre de scan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Lecture</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Lire les fichiers audio via FFmpeg (libav) et libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Utiliser le lecteur interne</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>Proxy du système</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>Proxy personnalisé</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>Paramètres personnalisés</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>Recherche en texte intégral</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>Autoriser la recherche en texte intégral pour :</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translatorcomment>typo in source sentence? *containing* more than</translatorcomment>
+        <translation>Ne pas rechercher dans les dictionnaires contenant plus de</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>article(s) (0 - pas de limite)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Sélectionnez cette option pour réduire automatiquement les longs articles</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Réduire les articles de plus de</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Les articles dépassant cette longueur seront réduits</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>symboles</translation>
     </message>
@@ -3184,59 +3701,59 @@
         <translation type="obsolete">Lire avec la bibliothèque Bass</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Utiliser un programme externe pour lire les fichiers audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Utiliser un programme externe :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Réseau</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Activez cette option pour utiliser un serveur proxy
 pour toutes les requêtes passant par le réseau.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Utiliser un proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Hôte :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Utilisateur :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3245,12 +3762,12 @@
 que du contenu est manquant, essayez de désactiver cette option.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Empêcher le chargement de contenu en provenance d&apos;autres sites (cache la plupart des publicités)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3259,24 +3776,24 @@
 Le greffon approprié doit être installé pour que cette option fonctionne.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Activer les greffons web</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Certains sites détectent GoldenDict à travers les en-tête HTTP et bloquent les requêtes.
 Activer cette option permet de contourner ce problème.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Ne pas s&apos;identifier en tant que GoldenDict dans les en-têtes HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3288,22 +3805,22 @@
 téléchargement.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Vérifier régulièrement les mises à jour</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>A&amp;vancé</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Fenêtre de scan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3314,12 +3831,12 @@
 Il n&apos;est pas nécessaire d&apos;activer cette option si vous n&apos;utilisez pas de tels programmes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Utiliser &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3327,12 +3844,12 @@
 Cette fonction marche uniquement avec les programmes qui la supportent.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Utiliser l&apos;a&amp;utomatisation de l&apos;interface</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3341,97 +3858,98 @@
 Ne fonctionne qu&apos;avec les programmes qui le supportent.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Utiliser les messages de &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Conserver l&apos;historique des mots traduits</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Conserver l&apos;&amp;historique</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Nombre maximal d&apos;entrées à conserver dans l&apos;historique.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Taille maximale de l&apos;historique :</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervalle de sauvegarde de l&apos;historique. Si cette valeur vaut 0, l&apos;historique sera sauvegardé uniquement lors de la sortie du programme.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Sauver toutes les</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Articles</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Toujours afficher les parties optionnelles des articles</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Afficher les &amp;parties optionnelles</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Défaut (système)</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Défaut</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Moderne</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Bleu</translation>
     </message>
@@ -3440,12 +3958,12 @@
         <translation type="obsolete">Jouer via DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Changement de langue</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Redémarrez le programme pour appliquer le changement de langue.</translation>
     </message>
@@ -3453,27 +3971,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Texte</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Préfixe</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -3499,27 +4017,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Ligne de commande</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
@@ -3527,12 +4045,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Erreur de chargement de l&apos;article</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Erreur de décodage de l&apos;article</translation>
     </message>
@@ -3643,19 +4163,19 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ERREUR : %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>
 Erreur lors de l&apos;enregistrement de la ressource :</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>La ressource référencée n&apos;a pas pu être téléchargée.</translation>
     </message>
@@ -3663,12 +4183,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Rōmaji Hepburn pour l&apos;Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Rōmaji Hepburn pour le Katakana</translation>
     </message>
@@ -3693,21 +4213,21 @@
         <translation type="obsolete">mot</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Suivant</translation>
     </message>
@@ -3720,32 +4240,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Prononcer le mot (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Envoyer le mot vers la fenêtre principale (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Affiche ou masque la barre de dictionnaire</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Utiliser pour épingler la fenêtre de manière à ce qu&apos;elle reste à l&apos;écran, puisse être redimensionnée ou gérée par d&apos;autres moyens.</translation>
@@ -3755,8 +4275,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3764,17 +4284,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
@@ -3796,7 +4316,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Ajouter...</translation>
     </message>
@@ -3805,7 +4326,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Retirer</translation>
     </message>
@@ -3882,7 +4404,7 @@
         <translation type="obsolete">Alternativement, utilisez %GD1251% pour le CP1251, %GDISO1% pour l&apos;ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programmes</translation>
     </message>
@@ -3891,34 +4413,34 @@
         <translation type="obsolete">N&apos;importe quel programme externe. Une chaîne %GDWORD% sera remplacée par le mot recherché. Le mot sera aussi utilisé dans l&apos;entrée standard.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Prononciations par &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Le site permet aux utilisateurs d&apos;enregistrer et partager des prononciations de mots. Vous pouvez les écouter à partir de GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Activer les prononciations à partir de Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Clé API :</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
         <translation>L&apos;utilisation de Forvo requiert une clé API. Laissez ce champ vide pour utiliser la clé par défaut, qui est susceptible de ne plus être disponible à l&apos;avenir, ou inscrivez-vous sur le site pour obtenir votre propre clé.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Obtenez une nouvelle clé &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;ici&lt;/a&gt;, ou laissez le champ vide pour utiliser la clé par défaut.</translation>
     </message>
@@ -3948,79 +4470,89 @@
 %GDBIG5% pour Big-5, %GDBIG5HKSCS% pour Big5-HKSCS, %GDGBK% pour GBK et GB18030, %GDSHIFTJIS% pour Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation>Serveurs DICT</translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation>Serveurs DICT :</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>N&apos;importe quel programme externe. Une chaîne %GDWORD% sera remplacée par le mot recherché. Si aucune chaîne n&apos;est détectée, le mot sera soumis sur l&apos;entrée standard.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Codes des langues (séparés par des virgules) :</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Liste des codes de langues dont vous souhaitez disposer. Par exemple : &quot;fr, en&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>La liste complète des codes de langues est disponible &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;ici&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Tanslitération</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Translitération russe</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Translitération grecque</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Translitération allemande</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Translitération biélorusse</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Activer l&apos;utilisation de l&apos;alphabet latin pour écrire le japonais</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonais (Rōmaji)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Systèmes :</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>La méthode la plus largement utilisée pour transcrire le japonais,
 basée sur la phonologie anglaise</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4031,12 +4563,12 @@
 Pas encore implémenté dans GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4047,75 +4579,77 @@
 Pas encore implémenté dans GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Syllabaires :</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Syllabaire japonais (Hiragana)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Syllabaire japonais (Katakana)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Synthèse vocale TTS</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(non disponible dans la version portable)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Sélectionner un répertoire</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Confirmer la suppression</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Retirer le dossier &lt;b&gt;%1&lt;/b&gt; de la liste ?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Retirer le site &lt;b&gt;%1&lt;/b&gt; de la liste ?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Retirer le programme &lt;b&gt;%1&lt;/b&gt; de la liste ?</translation>
     </message>
@@ -4245,22 +4779,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
@@ -4268,7 +4802,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Échec d&apos;interrogation de certains dictionnaires.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/it_IT.ts goldendict-1.5.0~git20150923/locale/it_IT.ts
--- goldendict-1.5.0~git20131003/locale/it_IT.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/it_IT.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Sconosciuto]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Basato su Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Espandi traduzione</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Compatta traduzione</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Per &lt;b&gt;%1&lt;/b&gt; non è stata trovata alcuna traduzione nel gruppo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Non è stata trovata alcuna traduzione nel gruppo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Benvenuto!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Benvenuto in &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Prima di iniziare ad usare il programma, apri il menu &lt;b&gt;&lt;i&gt;Modifica|Dizionari&lt;/b&gt;&lt;/i&gt; in modo da inserire il percorso della cartella che contiene i dizionari, impostare gli indirizzi di Wikipedia e delle altre risorse internet di traduzione, stabilire, raggruppare o modificare l&apos;ordine di visualizzazione dei dizionari.&lt;p&gt;&lt;p&gt;&lt;b&gt;Personalizzazioni&lt;/b&gt;&lt;br&gt;Personalizza il programma, regolando le impostazioni di puntamento previste dal menu &lt;b&gt;&lt;i&gt;Modifica|Impostazioni&lt;/b&gt;&lt;/i&gt;.&lt;p&gt;&lt;b&gt;Uso del programma&lt;/b&gt;&lt;br&gt;Un modo tradizionale per usare un dizionario consiste nel digitare il termine da ricercare nella casellina di ricerca (in alto a sinistra in questa stessa finestra).&lt;p&gt;&lt;b&gt;Scansiona e traduci le parole puntate&lt;/b&gt;&lt;br&gt;Altra caratteristica fondamentale di &apos;GoldenDict&apos; è che non serve neppure digitare la parola da cercare nella casellina di ricerca: basta puntarla col mouse in qualunque applicazione essa si trovi. Clicca &lt;a href=&quot;Scansione e traduzione delle parole puntate&quot;&gt;scansiona e traduci le parole puntate&lt;/a&gt; per scoprire come usarla.&lt;p&gt;In alternativa alla traduzione automatica della parola puntata, è sempre e comunque possibile, &lt;u&gt;selezionarne&lt;/u&gt; la parola e &lt;u&gt;premendo&lt;/u&gt; la combinazione di tasti &lt;b&gt;&lt;i&gt;CTRL+C+C&lt;/b&gt;&lt;/i&gt; vederne comparire la traduzione desiderata.&lt;p&gt;&lt;p&gt;Se hai bisogno di ulteriore aiuto, hai domande o suggerimenti o per qualsiasi altra richiesta, il tuo intervento nel &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt; del programma è benvenuto. &lt;p&gt;Controlla nel &lt;a href=&quot;http://goldendict.org/&quot;&gt;sito web&lt;/a&gt; se ci sono nuovi aggiornamenti del programma. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licenza GPLv3 o superiori.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Scansione e traduzione delle parole puntate</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Scansione e traduzione delle parole puntate&lt;/h3&gt;Per tradurre le parole puntate nelle applicazioni attive, è necessario attivarne la funzione nel modo seguente. Dalla finestra principale, apri il menu &lt;b&gt;Modifica|Impostazioni&lt;/b&gt;, quindi la scheda &lt;b&gt;&lt;i&gt;&quot;Puntamento&quot;&lt;/b&gt;&lt;/i&gt;. &lt;p&gt;In questa finestra spunta la casella &quot;Abilita l&apos;attività di scansione e traduzione delle parole puntate&quot;, imposta a piacimento la scansione e traduzione delle parole puntate e conferma il tutto premendo &quot;OK&quot;.&lt;p&gt;Indipendentemente dalle opzioni scelte, potrai attivare o disattivare in qualsiasi momento la scansione di ricerca tipica di questa modalità, cliccando il tasto destro del mouse sull&apos;iconcina del programma che appare nella barra di notifica di Windows. Nel menu che compare puoi cliccare l&apos;iconcina &lt;b&gt;&lt;i&gt;Scansiona e traduci le parole puntate sì/no&lt;/b&gt;&lt;/i&gt;, sia per attivarla che per disattivarla.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Appoggia il puntatore del mouse sulla parola sconosciuta e comparirà una finestra con la traduzione (o spiegazione) richiesta.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Seleziona una qualsiasi parola sconosciuta, (doppiocliccala o selezionala con il mouse premuto) e comparirà una finestra con la traduzione (o spiegazione) richiesta.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(senza titolo)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(immagine)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Espandi traduzione</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Da </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Compatta traduzione</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Errore d&apos;interrogazione: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Chiudi parole: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Espressioni composte:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Parole individuali:</translation>
     </message>
@@ -143,47 +143,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Seleziona traduzione corrente</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Copia come testo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Ispeziona</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Risorsa</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Voce sintetizzata (TTS)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Immagine</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definizione dal dizionario &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definizione: %1</translation>
     </message>
@@ -192,99 +192,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>La risorsa di riferimento non esiste.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Il programma audio di riferimento non esiste.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>Errore: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Salva suono</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>File sonori (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Tutti i file (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Salva immagine</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>File d&apos;immagine (*.bmp *.jpg *.png *.tif);;Tutti i file (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Apri collegamento</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Apri collegamento in una nuova &amp;scheda</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Apri collegamento in un programma di &amp;navigazione web esterno</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Cerca «%1»</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Cerca &quot;%1&quot; in una &amp;nuova scheda</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Invia &quot;%1&quot; alla linea di comando</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Aggiungi &quot;%1&quot; alla cronologia</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Cerca &quot;%1&quot; in %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Cerca &quot;%1&quot; in %2 in una &amp;nuova scheda</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>ATTENZIONE: Lettore audio FFmpeg: %1</translation>
     </message>
@@ -305,37 +306,37 @@
         <translation type="obsolete">La libreria Bass non è in grado di riprodurre questo suono.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>L&apos;esecuzione del file sonoro è fallita: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>La creazione del file temporaneo è fallita.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>L&apos;apertura automatica del file di risorsa è fallita. Provare ad aprire il file manualmente: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Lo scaricamento della risorsa di riferimento è fallita.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Salva &amp;immagine...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Salva s&amp;uono...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ATTENZIONE: %1</translation>
     </message>
@@ -345,42 +346,44 @@
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>scheda:vuota</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Cerca:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Precedente</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Successivo</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;MAIUSCOLE/minuscole</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Evidenzia &amp;ogni risultato</translation>
     </message>
@@ -406,6 +409,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Password:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -506,6 +532,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">File di testo (*.txt);;Tutti i file (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annulla</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -548,6 +687,16 @@
         <translation>Descrizione:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -564,6 +713,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Abilitato</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Indirizzo</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Icona</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -585,17 +802,22 @@
         <translation>Modifica questo gruppo</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Info sul dizionario</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Apri cartella dizionario</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Modifica dizionario</translation>
     </message>
@@ -603,39 +825,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Risorse</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Dizionari</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Gruppi</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Risorse modificate</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Alcune risorse sono state modificate. Accettare le modifiche?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Accetto</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -654,6 +876,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Nessuno</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Nessuno</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -692,6 +1000,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annulla</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -731,43 +1098,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Aggiungi gruppo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Assegna un nome al nuovo gruppo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Rinomina gruppo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Assegna un nuovo nome al gruppo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Rimuovi gruppo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Sei sicuro di volere rimuovere il gruppo &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Rimuovi ogni gruppo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Sei sicuro di volere rimuovere ogni gruppo?</translation>
     </message>
@@ -868,6 +1245,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Traduzione precedente</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Traduzione successiva</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Ingrandisci</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Riduci</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Ripristina zoom</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -898,12 +1323,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Suggerimenti ortografici: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfologia %1</translation>
     </message>
@@ -911,12 +1336,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -1956,7 +2381,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Errore di caricamento dei dizionari</translation>
     </message>
@@ -1964,7 +2389,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Errore nel file di configurazione. Continuare con le impostazioni preimpostate?</translation>
     </message>
@@ -1976,78 +2401,84 @@
         <translation type="obsolete">Barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Traduzione precedente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Traduzione successiva</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Scansiona e traduci le parole puntate sì/no</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Mostra finestra &amp;principale</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Caricamento...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Tralascia questa versione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Hai scelto di nascondere la barra dei menu. Utilizza %1 per mostrarla nuovamente.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Imposta pagina</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Non è disponibile alcuna stampante. Per proseguire installarne una.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Stampa traduzione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Traduzione come pagina completa (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Traduzione come pagina solo HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Salva traduzione come</translation>
     </message>
@@ -2056,54 +2487,54 @@
         <translation type="obsolete">File HTML (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Impossibile salvare la traduzione: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Salvataggio traduzioni...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>La finestra principale è impostata per essere mostrata sempre in primo piano.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 dizionari, %2 voci, %3 parole</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>L&apos;inizializzazione del meccanismo di monitoraggio dei tasti scorciatoia è fallito.&lt;br&gt;Assicurarsi che nel proprio XServer c&apos;è l&apos;estensione RECORD attiva.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>E&apos; disponibile una nuova versione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>E&apos; disponibile la nuova versione &lt;b&gt;%1&lt;/b&gt; di GoldenDict.&lt;br&gt;
 Clicca &lt;b&gt;Scarica&lt;/b&gt; per accedere alla pagina di scaricamento.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Scarica</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Cerca in:</translation>
     </message>
@@ -2116,98 +2547,98 @@
         <translation type="obsolete">Mostra icone piccole nelle barre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Barra dei &amp;menu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Trovato nei dizionari:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Ascolta la pronuncia (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Mostra i n&amp;omi dei dizionari nella barra</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Mostra icone &amp;piccole nelle barre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>Barra degli &amp;strumenti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Ingrandisci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Riduci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Ripristina zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Ingrandisci parole da cercare</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Riduci parole da cercare</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Ripristina zoom delle parole da cercare</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Chiudi scheda corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Chiudi ogni scheda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Chiudi ogni scheda eccetto la corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Cerca:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Tutto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>L&apos;accessibilità alle API non è abilitita</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importa cronologia da file</translation>
     </message>
@@ -2216,52 +2647,57 @@
         <translation type="obsolete">Importata dal file: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Errore d&apos;importazione: i dati nel file sono invalidi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Importazione della cronologia completata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Errore d&apos;importazione: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Info sul dizionario</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Modifica dizionario</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Schede aperte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Apri l&apos;elenco delle schede</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(senza titolo)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2270,7 +2706,7 @@
         <translation type="obsolete">ATTENZIONE: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Nascondi</translation>
     </message>
@@ -2279,23 +2715,23 @@
         <translation type="obsolete">Modalità visualizza cronologia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Esporta cronologia come file</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>File di testo (*.txt);;Tutti i file (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Esportazione cronologia completata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Errore di esportazione: </translation>
     </message>
@@ -2305,37 +2741,42 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Benvenuto!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>M&amp;odifica</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>G&amp;uida</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Pannello di &amp;ricerca</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Pannello dei risultati di &amp;ricerca</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Pannello della &amp;cronologica</translation>
     </message>
@@ -2344,27 +2785,27 @@
         <translation type="obsolete">&amp;Dizionari...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Impostazioni...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Cronologia</translation>
     </message>
@@ -2373,133 +2814,158 @@
         <translation type="obsolete">Pannello dei risultati di ricerca</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Dizionari...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Visita il sito web</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Info...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Esce dal programma</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Iconizza nella barra di notifica</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Iconizza il programma nella barra di notifica</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Salva traduzione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Salva la traduzione corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Imposta &amp;pagina</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>&amp;Anteprima di stampa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Rianalizza file</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nuova scheda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Mostra sempre in primo piano</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Mostra sempre in primo piano</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Pulsante menu</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Anteprima di stampa</translation>
     </message>
@@ -2508,48 +2974,48 @@
         <translation type="obsolete">Rianalizza file</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Elimina</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nuova scheda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Cartella di configurazione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Mostra</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Esporta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importa</translation>
     </message>
@@ -2561,12 +3027,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Il file del dizionario risulta alterato o corrotto</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Impossibile caricare la traduzione da %1, per il motivo seguente: %2</translation>
     </message>
@@ -2574,7 +3040,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Errore di analisi XML: %1 al %2,%3</translation>
     </message>
@@ -2582,7 +3048,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Errore di analisi XML: %1 al %2,%3</translation>
     </message>
@@ -2590,22 +3056,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Icona</translation>
     </message>
@@ -2618,88 +3084,94 @@
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Ordine dei dizionari:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Dizionari inattivi (disabilitati):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informazioni sul dizionario</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Totale voci:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Parole totali:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Traduzione da:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Traduzione in:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>File relativi a questo dizionario:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Modifica l&apos;ordine trascinando col mouse i nomi dei vari dizionari. Sposta quelli non utilizzati nel gruppo dei dizionari inattivi, per bloccarne la consultazione.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Ordina per nome</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Ordina per lingua</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Percorso</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Ricorsivo</translation>
     </message>
@@ -2809,14 +3281,14 @@
         <translation>il doppio clic del mouse, traduce la parola cliccata</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Spuntando questa casella, si attiva sin dall&apos;inizio l&apos;attività di scansione e traduzione delle parole puntate. 
 Al contrario se si deseleziona questa casella, scansione e traduzione vengono disabilitate.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2830,27 +3302,27 @@
 Questa funzione consente di premere tali tasti anche qualche secondo più tardi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Tasti scorciatoia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>utilizza la seguente combinazione di tasti per visualizzare o nascondere la finestra principale:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>utilizza la seguente combinazione di tasti per tradurre una parola memorizzata negli Appunti di Windows:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Queste combinazioni di tasti sono globali e questo significa che funzionano in qualsiasi programma e contesto a condizione che il programma sia attivo in sottofondo.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Puntamento</translation>
     </message>
@@ -2901,17 +3373,22 @@
         <translation>Stile dei moduli aggiuntivi (add-on):</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Modificare questo valore in modo da evitare menu contestuali troppo estesi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Limite sul numero di dizionari per il menu contestuale:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2923,134 +3400,134 @@
 si premono i tasti prescelti.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Abilita l&apos;attività di scansione e traduzione delle parole puntate</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>abilita l&apos;attività di scansione e traduzione delle parole puntate fin dall&apos;avvio del programma</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Spuntando questa casella, si attiva l&apos;attività di scansione e traduzione 
 delle parole puntate quando i tasti scelti vengono effettivamente premuti.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>abilita l&apos;attività di scansione e traduzione delle parole puntate solo se tutti i tasti selezionati sono premuti:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Solo tasto Ctrl sinistro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl sinistro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Solo tasto MAIUSCOLE destro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>MAIUSCOLE destro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tasto Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tasto Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Solo tasto Alt sinistro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt sinistro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tasto MAIUSCOLE</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>MAIUSCOLE</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Solo tasto Alt destro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt destro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Solo tasto Ctrl destro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl destro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Solo tasto MAIUSCOLE sinistro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>MAIUSCOLE sinistro</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tasto di Windows o Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Windows o Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>i tasti possono essere premuti nell&apos;arco di tempo di </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3059,47 +3536,82 @@
 entro il limite di secondi qui specificato.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>secondi</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Mostra le traduzioni nella finestra principale del programma invece che nella classica finestra a comparsa</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>mostra le traduzioni nella finestra principale del programma</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Riproduce l&apos;audio utilizzando le librerie FFmpeg(libav) e libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Utilizza lettore interno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Spuntando questa casella vengono automaticamente compattate le traduzioni troppo estese</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>compatta le traduzioni più estese di </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Le traduzioni più estese di queste dimensioni verranno compattate</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>caratteri</translation>
     </message>
@@ -3114,17 +3626,17 @@
         <translation type="obsolete">Riproduci utilizzando le librerie Bass</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Avanzate</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Tecnologie di scansione delle parole puntate da tradurre</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3135,12 +3647,12 @@
 Non è necessario attivare questa opzione se non si usano tali programmi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>utilizza &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3149,12 +3661,12 @@
 Non è necessario attivare questa opzione se non si usano tali programmi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>utilizza &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3163,67 +3675,67 @@
 Non è necessario attivare questa opzione se non si usano tali programmi.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>utilizza messaggistica di &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Cronologia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Spuntando questa casella, viene memorizzata la cronologia delle parole tradotte</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>memorizza la &amp;cronologia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Specificare il numero massimo di inserimenti da mantenere nella cronologia.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Dimensione massima della cronologia:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervallo di salvattaggio della cronologia. Impostando il valore 0 la cronologia verrà salvata soltanto alla chiusura del programma.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Salva ogni </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minuti</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Traduzioni</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Spuntando questa casella, vengono espansi i contesti opzionali delle voci tradotte</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>espandi i &amp;contesti opzionali delle voci tradotte</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3236,27 +3748,27 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Nota: Sembra che tu stia eseguendo una versione di X.Org XServer che ha l&apos;estensione di registrazione RECORD danneggiata. I tasti scorciatoia di GoldenDict probabilmente non funzioneranno. Questo problema va&apos; risolto nel server stesso. Consulta la documentazione seguente &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;sugli errori &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; e se lo ritieni opportuno lascia un messaggio.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Pronuncia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Pronuncia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>pronuncia automaticamente le parole dalla finestra principale</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>pronuncia automaticamente le parole puntate</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Riproduzione</translation>
     </message>
@@ -3281,59 +3793,59 @@
         <translation type="obsolete">Riproduci con Phonon</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Usa un qualsiasi programma esterno per riprodurre i file audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Usa un programma esterno:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Rete</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Abilitare questa casella per utilizzare un server proxy 
 per ogni programma della rete che lo richieda.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Utilizza server proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Porta:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Utente:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3342,12 +3854,12 @@
 Se alcuni siti dovessero bloccarsi, provare a disabilitare questa casella.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>non permettere il caricamento dei contenuti da altri siti (nasconde la maggioranza dei messaggi pubblicitari)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3356,24 +3868,24 @@
 Affinché questa opzione possa funzionare, è necessario che i plugin richiesti siano installati.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>abilita i plugin web</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Alcuni siti web rilevano GoldenDict via intestazione HTTP e ne bloccano le richieste.
 Spuntare questa casella per raggirare il problema.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>non consentire che GoldenDict venga identificato nelle intestazioni HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3384,42 +3896,43 @@
 e si collega al sito del programma.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>controlla periodicamente la presenza di aggiornamenti e novità</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Preimpostata nel sistema</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Preimpostato</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Moderna</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3428,12 +3941,12 @@
         <translation type="obsolete">Riproduci utilizzando le DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Modifica della lingua</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>La modifica della lingua avrà effetto al riavvio del programma.</translation>
     </message>
@@ -3441,27 +3954,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Testo semplice</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Compita prefisso</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
@@ -3487,27 +4000,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Linea di comando</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Icona</translation>
     </message>
@@ -3515,12 +4028,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Errore di caricamento della traduzione</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Errore di decodifica del file di traduzione</translation>
     </message>
@@ -3631,18 +4146,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>Errore: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Errore di salvataggio risorsa:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Lo scaricamento della risorsa di riferimento è fallita.</translation>
     </message>
@@ -3650,12 +4165,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Romanizzazione hepburn per Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Romanizzazione hepburn per Katakana</translation>
     </message>
@@ -3680,12 +4195,12 @@
         <translation type="obsolete">parola</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Traduzione precedente</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Traduzione successiva</translation>
     </message>
@@ -3698,43 +4213,43 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Ascolta la pronuncia (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Mostra la traduzione nella finestra principale del programma (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Mostra o nasconde la barra dei dizionari</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Fissa sullo schermo la finestra dei risultati tradotti,
 in modo che possa essere ridimensionata o gestita liberamente.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3743,8 +4258,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3752,17 +4267,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Percorso</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Icona</translation>
     </message>
@@ -3770,45 +4285,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Testo a sintesi vocale (Text to Speech)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(funzione non disponibile nella versione portatile)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Scegli una cartella</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Conferma eliminazione</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Rimuovere la cartella &lt;b&gt;%1&lt;/b&gt; dall&apos;elenco?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Rimuovere il sito &lt;b&gt;%1&lt;/b&gt; dall&apos;elenco?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Rimuovere il programma &lt;b&gt;%1&lt;/b&gt; dall&apos;elenco?</translation>
     </message>
@@ -3827,7 +4344,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Aggiungi...</translation>
     </message>
@@ -3836,7 +4354,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Elimina</translation>
     </message>
@@ -3905,7 +4424,7 @@
         <translation type="obsolete">In alternativa usare %GD1251% al posto di  CP1251 e/o %GDISO1% invece di ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programmi</translation>
     </message>
@@ -3914,27 +4433,27 @@
         <translation type="obsolete">Qualsiasi programma esterno. La stringa %GDWORD% verrà sostituita con la parola ricercata. La parola verrà inoltre riportata nella casella d&apos;immissione come se fosse stata digitata.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Pronuncia direttamente da &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Questo sito permette alle persone di registrare e condividere la pronuncia delle parole ed è possibile ascoltarle direttamente da GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Abilita la pronuncia da Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Chiave API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3943,7 +4462,7 @@
 In alternativa è possibile registrarsi al sito ed ottenere una chiave personale.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Ottieni &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;qui&lt;/a&gt; la tua chiave personale oppure lascia il campo vuoto per utilizzare quella preimpostata.</translation>
     </message>
@@ -3973,79 +4492,89 @@
 %GDBIG5% per Big-5, %GDBIG5HKSCS% per Big5-HKSCS, %GDGBK% per GBK e GB18030, %GDSHIFTJIS% per Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Per qualsiasi programma esterno. La stringa %GDWORD% va&apos; posta in fondo alla linea di comando ed essa verrà sostituita dalla parola che si desidera tradurre. Se però nella riga di comando non fosse presente alcuna stringa, la parola da tradurre verrebbe passata all&apos;applicazione esterna come un inserimento standard.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Codici della lingua (separarli con una virgola e uno spazio):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Elenco dei codici delle lingue desiderate. Ad esempio: &quot;en, ru, it&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>L&apos;elenco completo dei codici delle lingue è disponibile &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;qui&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Traslitterazione</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>russo traslitterato</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>greco traslitterato</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>tedesco traslitterato</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>traslitterazione bielorusso</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Attiva la romanizzazione del giapponese</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>giapponese romanizzato (convertito in caratteri latini)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemi:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Diffuso sistema di romanizzazione del giapponese,
 basato sui fonemi inglesi</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>romanizzazione hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4056,12 +4585,12 @@
 Non ancora implementato.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4072,32 +4601,32 @@
 Non ancora implementato.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Sillabari:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Sillabario giapponese Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Sillabario giapponese Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4242,22 +4771,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Icona</translation>
     </message>
@@ -4265,7 +4794,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Impossibile consultare alcuni dizionari.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/ja_JP.ts goldendict-1.5.0~git20150923/locale/ja_JP.ts
--- goldendict-1.5.0~git20131003/locale/ja_JP.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/ja_JP.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[不明]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>グループ &lt;b&gt;%2&lt;/b&gt; に &lt;b&gt;%1&lt;/b&gt; の翻訳が見つかりません。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>グループ &lt;b&gt;%1&lt;/b&gt; に翻訳が見つかりません。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>ようこそ!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;&lt;b&gt;GoldenDict&lt;/b&gt; へようこそ!&lt;/h3&gt;&lt;p&gt;このプログラムでの作業を開始するには、まず &lt;b&gt;[編集|辞書]&lt;/b&gt; を開いて辞書ファイルを検索するディレクトリのパスを追加したり、さまざまな Wikipedia のサイトやその他のソースを設定したり、辞書の順序を調整したり辞書グループを作成したりします。&lt;p&gt;次にはもう単語を検索する準備ができています! このウィンドウの左のペインを使用するか、&lt;a href=&quot;Working with popup&quot;&gt;他のアクティブなアプリケーションから単語を検索します&lt;/a&gt;。&lt;p&gt;プログラムをカスタマイズするには、&lt;b&gt;[編集|環境設定]&lt;/b&gt; で利用可能なオプションをチェックしてください。そこにある設定にはすべてツールチップがあります、何か疑問に思った場合はそれらを読むようにしてください。&lt;p&gt;さらなるヘルプを必要とする場合、質問、提案やその他気になることがある場合は、プログラムの&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;フォーラム&lt;/a&gt;で歓迎されます。&lt;p&gt;更新はプログラムの&lt;a href=&quot;http://goldendict.org/&quot;&gt;Web サイト&lt;/a&gt;をチェックしてください。&lt;p&gt;(c) 2008-2013 Konstantin Isakov. GPLv3 以降の下でライセンスされています。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>ポップアップ作業</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;ポップアップ作業&lt;/h3&gt;他のアクティブなアプリケーションから単語を検索するには、まず &lt;b&gt;[環境設定]&lt;/b&gt; で &lt;i&gt;&quot;スキャン ポップアップ機能&quot;&lt;/i&gt; を有効にする必要があり、次からは上の &apos;ポップアップ アイコンを切り替えるか、または右マウス ボタンで下のトレイ アイコンをクリックしてポップしているメニューで選択することによっていつでも有効にできます。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>次に他のアプリケーションで検索したい単語の上でカーソルを止めると、説明のウィンドウがポップアップします。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>次に他のアプリケーションで検索したい単語をマウスで選択 (ダブルクリックまたは長押し) すると、単語を説明するウィンドウがポップアップします。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(無題)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>From </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>クエリ エラー: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>類似語: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>複合表現: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>単語ごと: </translation>
     </message>
@@ -143,47 +143,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -192,99 +192,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>参照されたりソースが存在しません。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>リンクを開く(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>新しいタブでリンクを開く(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>外部ブラウザーでリンクを開く(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&quot;%1&quot; を検索(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>新しいタブで &quot;%1&quot; を検索(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>%2 から &quot;%1&quot; を検索</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>新しいタブで %2 から &quot;%1&quot; を検索(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -297,37 +298,37 @@
         <translation type="obsolete">WAV 以外のファイルの再生を有効にするには、[オーディオ] タブの &quot;DirectShow を通じて再生する&quot; を選択します。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>サウンド ファイルを再生するプレーヤーの実行に失敗しました: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>一時ファイルの作成に失敗しました。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>リソース ファイルの自動オープンに失敗しました、手動で開いています: %1。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>参照されたリソースのダウンロードに失敗しました。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation type="unfinished">警告: %1</translation>
     </message>
@@ -337,42 +338,44 @@
         <translation>フォーム</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>検索:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>前へ(&amp;P0</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>次へ(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>大文字と小文字を区別する(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -397,6 +400,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">パスワード:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -497,6 +523,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">キャンセル</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -539,6 +678,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -554,6 +703,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">有効</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">名前</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">アドレス</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -575,17 +792,22 @@
         <translation>このグループを編集</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation type="unfinished"></translation>
     </message>
@@ -593,39 +815,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>ソース(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>辞書(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>グループ(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>ソースが変更されました</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>いくつかのソースが変更されました。変更を承認しますか?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>承認</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -644,6 +866,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">なし</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">なし</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -682,6 +990,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -721,43 +1088,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>グループの追加</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>新しいグループの名前:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>グループ名の変更</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>グループの新しい名前:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>グループの削除</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>グループ &lt;b&gt;%1&lt;/b&gt; を削除してもよろしいですか?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>すべてのグループを削除</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>すべてのグループを削除してもよろしいですか?</translation>
     </message>
@@ -858,6 +1235,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">戻る</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">進む</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">拡大</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">縮小</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">通常のサイズ</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -888,12 +1313,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>もしかして: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 形態</translation>
     </message>
@@ -901,12 +1326,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
@@ -1946,7 +2371,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>辞書の読み込みエラー</translation>
     </message>
@@ -1954,7 +2379,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1966,78 +2391,78 @@
         <translation type="obsolete">操作</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>戻る</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>進む</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>スキャン ポップアップ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>メイン ウィンドウの表示(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>終了(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>読み込んでいます...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>このリリースをスキップ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>ページ設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>利用可能なプリンターがありません。まずインストールしてください。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>記事の印刷</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>名前を付けて記事を保存</translation>
     </message>
@@ -2046,43 +2471,43 @@
         <translation type="obsolete">HTML ファイル (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>記事を保存できません: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 個の辞書、%2 個の記事、 %3 個の単語</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>ホットキー監視機構の初期化に失敗しました。&lt;br&gt;XServer の RECORD 拡張がオンになっていることを確認してください。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>新しいリリースが利用可能です</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>GoldenDict のバージョン &lt;b&gt;%1&lt;/b&gt; のダウンロードが利用可能です。&lt;br&gt;ダウンロード ページへ移動するには&lt;b&gt;ダウンロード&lt;/b&gt;をクリックします。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>検索する場所:</translation>
     </message>
@@ -2091,158 +2516,169 @@
         <translation type="obsolete">辞書バーに名前を表示する</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>単語の発音 (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>拡大</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>縮小</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>通常のサイズ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>単語の拡大</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>単語の縮小</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>通常の単語のサイズ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>現在のタブを閉じる</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>すべてのタブを閉じる</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>現在以外のすべてのタブを閉じる</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>検索:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>すべて</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>開いているタブ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(無題)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2251,28 +2687,28 @@
         <translation type="obsolete">警告: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2282,32 +2718,32 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>ようこそ!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>環境設定(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
@@ -2316,163 +2752,193 @@
         <translation type="obsolete">グループ(&amp;G)...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>表示(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>ズーム&amp;Z)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>履歴(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>辞書(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation type="unfinished">F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>ホーム ページ(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>バージョン情報(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>GoldenDict のバージョン情報</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>アプリケーションを終了します</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>フォーラム(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>トレイへ閉じる(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>トレイへウィンドウを最小化します</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>記事の保存(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>記事の保存</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>印刷(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>ページ設定(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">印刷プレビュー</translation>
     </message>
@@ -2481,48 +2947,48 @@
         <translation type="obsolete">ファイルの再スキャン</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>クリア(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2534,12 +3000,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2547,7 +3013,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 分析エラー: %1 at %2,%3</translation>
     </message>
@@ -2555,7 +3021,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 分析エラー: %1 at %2,%3</translation>
     </message>
@@ -2563,22 +3029,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>アドレス</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,88 +3057,94 @@
         <translation>フォーム</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>辞書の順序:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>非アクティブ (無効) な辞書:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>辞書の情報</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>辞書の合計:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>単語の合計:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>翻訳元:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>翻訳先:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>この辞書を含むファイル:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>アイテムをドラッグ アンド ドロップして順序を調整します。使用を無効にするには非アクティブなグループへ辞書をドロップします。</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>再帰</translation>
     </message>
@@ -2784,14 +3256,14 @@
         <translation>ダブルクリックでクリックされた単語を翻訳する</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>スキャン ポップアップ モードを既定でオンにするかを選択します。チェックされている場合、
 プログラムは常にスキャン ポップアップがアクティブで起動します。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2802,27 +3274,27 @@
 選択が完了した直後にも押すことができます。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>ホットキー</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>メイン ウィンドウを表示または非表示にするのに次のホットキーを使用します:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>クリップボードからの単語を翻訳するのに次のホットキーを使用します:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>ホットキーはグローバルであり、GoldenDict が背景で起動中であればすべてのプログラムで脈絡なく実行します。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>スキャン ポップアップ(&amp;S)</translation>
     </message>
@@ -2873,17 +3345,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2894,134 +3371,134 @@
 またはトレイ アイコンからオンとオフを切り替えることができます。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>スキャン ポップアップ機能を有効にする</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>スキャン ポップアップをオンにして起動する</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>これが有効だと、ポップアップは単語の選択範囲が変更したときに
 すべての選択されたキーが押されている状態でのみ表示されます。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>すべての選択されたキーが押されているときのみポップアップを表示する:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>左 Ctrl のみ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>左 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>右 Shift のみ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>右 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt キー</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Ctrl キー</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>左 Alt のみ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>左 Al</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Shift キー</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>右 Alt のみ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>右 Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>右 Ctrl のみ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>右 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>左 Shift のみ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>左 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows キーまたは Meta キー</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>キーはその後</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3030,22 +3507,22 @@
 後にのみ監視されます。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>秒まで押せる</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3058,57 +3535,92 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;注意: RECORD 拡張が破損した X.Org XServer リリースを実行しているようです。GoldenDict のホットキーが動作しない可能性があります。これはサーバー自体で修正される必要があります。次の&lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;バグ エントリ&lt;/span&gt;&lt;/a&gt;を参照して&lt;span style=&quot; color:#ff0000;&quot;&gt;できればそこにコメントを残してください。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>オーディオ(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>発音</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>メイン ウィンドウで単語を自動的に発音する</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>スキャン ポップアップで単語を自動的に発音する</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>再生</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3133,59 +3645,59 @@
         <translation type="obsolete">Phonon を通じて再生する</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>オーディオ ファイルの再生に外部プログラムを使用します</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>外部プログラムを使用する:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>ネットワーク(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>すべてのプログラムのネットワーク要求にプロキシ
 サーバーを使用したい場合は有効にします。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>プロキシ サーバーを使用する</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>種類:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>ホスト:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>ユーザー:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3194,35 +3706,35 @@
 ブロックします。特定のサイトが破損する場合は、これを無効にしてみてください。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>他のサイトからのコンテンツの読み込みを無効にする (ほとんどの広告を非表示にします)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3234,22 +3746,22 @@
 ダウンロード ページを開くか確認します。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>定期的に新しいプログラム リリースをチェックする</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3257,121 +3769,122 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>システム既定</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>既定</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3380,12 +3893,12 @@
         <translation type="obsolete">DirectShow を通じて再生する</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>言語の変更</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>言語の変更を適用するにはプログラムを再起動します。</translation>
     </message>
@@ -3393,27 +3906,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,27 +3952,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation type="unfinished">有効</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3467,12 +3980,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3583,18 +4098,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation type="unfinished">参照されたリソースのダウンロードに失敗しました。</translation>
     </message>
@@ -3602,12 +4117,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>ヘボン式ローマ字のひらがな</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>ヘボン式ローマ字のカタカナ</translation>
     </message>
@@ -3632,12 +4147,12 @@
         <translation type="obsolete">単語</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation type="unfinished">戻る</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation type="unfinished">進む</translation>
     </message>
@@ -3650,43 +4165,43 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>単語の発音 (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>辞書バーの表示または非表示を切り替えます</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>ウィンドウを画面に固定してサイズの変更ができる
 ようにするにはこのピンを使用します。</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3695,8 +4210,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3704,17 +4219,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3722,45 +4237,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(ポータブル バージョンでは利用できません)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>ディレクトリを選択します</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>削除の確認</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>一覧からディレクトリ &lt;b&gt;%1&lt;/b&gt; を削除しますか?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>一覧からサイト &lt;b&gt;%1&lt;/b&gt; を削除しますか?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3779,7 +4296,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>追加(&amp;A)...</translation>
     </message>
@@ -3788,7 +4306,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>削除(&amp;R)</translation>
     </message>
@@ -3852,32 +4371,32 @@
         <translation type="obsolete">また、CP1251 には %GD1251%、ISO 8859-1 には %GDISO1% を使用します。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>&lt;a href=&quot;http://www.forvo.com/&quot;&gt;Forvo.com&lt;/a&gt; からの生の発音です。このサイトで人々は単語の発音を録音および共有します。GoldenDict からそれらを聴くことができます。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Forvo からの発音を有効にする</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API キー:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3886,7 +4405,7 @@
 またはサイトで登録して自分のキーを取得します。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3915,78 +4434,88 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>言語コード (コンマ区切り):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>使用したい言語コードの一覧です。例: &quot;en, ja&quot;。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>言語コードの完全な一覧は&lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;こちら&lt;/a&gt;です。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>音訳</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>ロシア語音訳</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>ギリシャ語音訳</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>ドイツ語音訳</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>日本語の記述のラテン文字の使用を有効にします</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>日本語ローマ字</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>システム:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>英語の音韻に基づいた、最も広く使われている日本語の音写法です</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>ヘボン式</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3997,12 +4526,12 @@
 GoldenDict にはまだ実装されていません。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>日本式</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4013,32 +4542,32 @@
 GoldenDict にはまだ実装されていません。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>訓令式</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>仮名:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>ひらがな</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>ひらがな</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>カタカナ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>カタカナ</translation>
     </message>
@@ -4178,22 +4707,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>アドレス</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4201,7 +4730,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>いくつかの辞書のクエリに失敗しました。</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/ko_KR.ts goldendict-1.5.0~git20150923/locale/ko_KR.ts
--- goldendict-1.5.0~git20131003/locale/ko_KR.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/ko_KR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[모름]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Based on Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>사전 펼치기</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>사전 감추기</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>&lt;b&gt;%2&lt;/b&gt;그룹에서 &lt;b&gt;%1&lt;/b&gt;에 대한 번역을 찾을 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>&lt;b&gt;%1&lt;/b&gt;그룹에서 번역을 찾을 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>환영합니다!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;&lt;b&gt;GoldenDict&lt;/b&gt;사용을 환영합니다!&lt;/h3&gt;&lt;p&gt;프로그램 사용을 위해서 먼저 &lt;b&gt;편집|사전&lt;/b&gt; 에서 사용할 사전의 경로, Wikipedia와 다른 온라인 검색사이트 등록를 등록하고 사전의 표시순서와 그룹을 지정하십시오. &lt;p&gt;그러면 사용을 위한 준비가 끝났습니다! 지금 창의 왼쪽에서 검색어를 입력하거나  실행중인 &lt;a href=&quot;팝업창 사용&quot;&gt;다른 프로그램에서 단어검색&lt;/a&gt;을 할 수 있습니다. &lt;p&gt;프로그램을 자신에 맞게 설정하려면 &lt;b&gt;편집|설정&lt;/b&gt;메뉴를 사용하십시오. 모든 설정항목은 말풍선 도움말이 있으니 기능을 잘 모르는 경우 꼭 확인하시기 바랍니다. &lt;p&gt;더 많은 도움이 필요하거나 질문, 제안사항이 있는 경우 또는 다른 사용자들의 생각이 궁금하면 프로그램의 &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;포럼&lt;/a&gt;을 방문하십시오.&lt;p&gt;프로그램 업데이트는 &lt;a href=&quot;http://goldendict.org/&quot;&gt;웹사이트&lt;/a&gt;를 방문하십시오.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>팝업창 사용</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;팝업창 사용&lt;/h3&gt;&lt;p style=&quot;text-indent:1em&quot;&gt;실행중인 프로그램에서 단어를 검색하려면 먼저 &lt;b&gt;설정&lt;/b&gt;에서 &lt;b&gt;스캔팝업기능&lt;/b&gt;을 활성화해야 합니다. 다음 아무때나 위의 팝업아이콘을 누르거나 혹은 작업표시줄의 아이콘을 우클릭한 뒤 선택하면 활성화할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>이제 실행중인 다른 프로그램에서 검색할 단어 위에 커서를 옮기면 팝업창으로 사전이 나타납니다.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>이제 다른 프로그램에서 검색할 단어를 선택하면(더블클릭 또는 마우스로 선택) 팝업창으로 사전이 나타납니다.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(제목없음)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(그림)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>사전 펼치기</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>From </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>사전 감추기</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>검색오류: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>인접 어휘:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>복합 어구:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>개별 어휘:</translation>
     </message>
@@ -143,93 +143,94 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>현재 항목 선택</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>텍스트로 복사</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>요소검사</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>리소스</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS 음성</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>그림</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>비디오</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>비디오: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>사전의 정의 &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>정의: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>참조할 리소스가 존재하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>참조할 오디오 프로그램이 존재하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>오류: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>사운드 저장</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>사운드 파일 (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;모든 파일 (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>이미지 저장</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>이미지 파일 (*.bmp *.jpg *.png *.tif);;모든 파일 (*.*)</translation>
     </message>
@@ -238,53 +239,53 @@
         <translation type="obsolete">리소스 저장 오류: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>링크 열기(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>새 탭에서 링크 열기(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>외부 브라우저에서 링크 열기(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&quot;%1&quot; 검색(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>새 탭에서 &quot;%1&quot; 검색(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>&quot;%1&quot;을 입력줄로 보냄</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>검색기록에 &quot;%1&quot; 추가(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>%2에서 &quot;%1&quot; 검색</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>새 탭을 열고 %2에서 &quot;%1&quot; 검색(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>경고: FFmpeg 오디오 플레이어: %1</translation>
     </message>
@@ -305,37 +306,37 @@
         <translation type="obsolete">Bass library가 이 사운드를 재생할 수 없습니다. </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>사운드를 재생할 플레이어를 실행할 수 없습니다: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>임시파일을 만들 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>리소스파일을 여는데 실패했습니다. 수동으로 열어 보십시오: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>참조할 리소스를 다운로드하지 못했습니다.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>이미지 저장(&amp;i)...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>사운드 저장(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>경고: %1</translation>
     </message>
@@ -345,44 +346,46 @@
         <translation>형태</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>찾기:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>이전(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>다음(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>대소문자 구분(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
-        <translation>전체 강조표시(&amp;a)</translation>
+        <translation>검색어 강조(&amp;a)</translation>
     </message>
 </context>
 <context>
@@ -406,6 +409,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>프록시 인증이 필요함</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>프록시를 통해 접근하기 위해서는 사용자명과 암호를 입력해야 합니다</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>사용자 이름:</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>암호:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -506,6 +532,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>검색 모드</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>이 요소는 필터가 어떻게 해석될 것인지 결정합니다</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>체크하면 필터링시에 대소문자가 고려될 것입니다</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>대소문자 구분</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>표제어들을 파일로 저장합니다</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>내보내기</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation>도움말</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>표제어목록에 필터를 적용하려면 이 버튼을 누르시오</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>적용</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>체크하면 필터 변경이 즉시 표제어목록에 적용될 것입니다</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>자동 적용</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>필터:</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>필터 (고정문자열, 와일드카드 또는 정규식)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>텍스트</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>와일드카드</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>정규식</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>전체 표제어 수: %1, 필터링 후: %2</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>표제어들을 파일로 저장합니다</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>텍스트파일(*.txt);;모든 파일(*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>표제어 내보내기...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -548,6 +687,16 @@
         <translation>설명:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>사전의 모든 표제어들을 표시합니다</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>표제어</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -564,6 +713,76 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation>Url: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation>데이터베이스:</translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation>검색 조건:</translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation>활성</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation>이름</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation>데이터베이스</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation>조건</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation>아이콘</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>콤마로 구분된 데이터베이스 목록
+(공백 또는 &quot;*&quot; 는 데이터베이스 전체)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation>콤마로 구분된 검색조건 목록
+(공백은 &quot;prefix&quot; 조건)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -581,17 +800,22 @@
         <translation>그룹 편집</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>사전 정보</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>사전 표제어</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>사전 폴더 열기</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>사전 편집</translation>
     </message>
@@ -599,39 +823,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>사전소스(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>사전(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>그룹(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>소스가 변경되었습니다</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>일부 소스가 변경되었습니다. 변경을 수락하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>수락</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
@@ -650,6 +874,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>전문검색</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>단어 단위로 찾기</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>텍스트</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>와일드카드</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>정규식</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>단어사이의 최대 거리 (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>사전당 최대 항목 (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>검색된 항목:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>목록작성중:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>검색어에 있는 CJK 기호들이 &quot;단어 단위로 찾기&quot;  &quot;텍스트&quot; 검색모드에 사용될 수 없습니다.</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation>검색 줄은 적어도 한 개 단어를 포함해야 합니다</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation>자 이상</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>전문검색을 위한 사전이 없음</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -688,6 +998,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>검색</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>대소문자 구분</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>검색된 항목:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>그룹에서 이용가능한 사전:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>목록작성을 위해 대기중:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>전체:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>목록작성완료:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>목록작성중: 없음</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation>도움말</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -727,43 +1096,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>그룹 탭</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>그룹 목록을 엽니다</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>그룹 추가</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>새 그룹의 이름을 지정합니다:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>그룹 이름 변경</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>새로운 그룹 이름을 지정합니다:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>그룹 삭제</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt;그룹을 삭제하시겠습니까?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>모든 그룹 삭제</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>모든 그룹을 삭제하시겠습니까?</translation>
     </message>
@@ -864,6 +1243,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation>골든딕 도움말</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation>홈</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation>뒤로</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation>앞으로</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation>확대</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation>축소</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation>보통 </translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation>내용</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation>목록</translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -894,12 +1321,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>철자법 제안: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 철자법사전</translation>
     </message>
@@ -907,12 +1334,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>활성</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
@@ -1952,7 +2379,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>사전 호출 실패</translation>
     </message>
@@ -1960,7 +2387,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>설정파일 오류. 기본설정으로 계속하시겠습니까?</translation>
     </message>
@@ -1968,68 +2395,68 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>뒤로</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>앞으로</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>스캔팝업</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>메인창 보이기(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>종료(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>불러오는 중...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>이 버전을 무시합니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>메뉴 모음 숨기기를 선택하셨습니다. 다시 보이게 하려면 %1을 사용하십시오.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>페이지 설정</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>프린터가 없습니다. 먼저 프린터를 설치하십시오.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>항목 인쇄</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>다른 이름으로 항목 저장</translation>
     </message>
@@ -2038,469 +2465,511 @@
         <translation type="obsolete">Html 파일(*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>항목을 저장할 수 없습니다: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>사전수: %1，항목수: %2，어휘수: %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>단축키 감시메커니즘을 시작할 수없습니다..&lt;br&gt;XServer에서 RECORD extension이 활성화 되어 있는지 확인하십시오.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>새 버전이 있습니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>골든딕 &lt;b&gt;%1&lt;/b&gt;버전을 다운로드할 수 있습니다.&lt;br&gt;&lt;b&gt;다운로드&lt;/b&gt;를 누르면 다운로드 페이지로 연결됩니다.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>다운로드</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>검색그룹:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>메뉴 모음(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
-        <translation>사전 검색 결과:</translation>
+        <translation>검색된 사전:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>발음 듣기(Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>사전모음에 이름 보이기(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>도구모음에 작은 아이콘(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>탐색 도구모음(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>확대</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>축소</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>보통 </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>검색어 확대</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>검색어 축소</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>검색어 보통 </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>현재 탭 닫기</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>모든 탭 닫기</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>다른 탭 닫기</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>검색:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>All</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Accessibility API가 활성화 되지 않았습니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>메인창이 항상 위에 보이도록 설정합니다.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>검색기록을 파일에서 불러옵니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>불러오기 오류: 파일의 데이타가 유효하지 않습니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>검색기록 불러오기를 완료했습니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>불러오기 오류: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>사전 정보</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>사전 표제어</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>사전 폴더 열기</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
-        <translation>Редактировать словарь</translation>
+        <translation>사전 편집</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>열린 탭</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>사전에서 찾을 문자열. 와일드카드 &apos;*&apos;, &apos;?&apos; 괄호문자 &apos;[...]&apos;가 허용됩니다.
+&apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; 기호를 찾으려면 각각 &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;를 사용하십시오</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>탭 목록을 엽니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(제목없음)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>항목, 전부 (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>항목, HTML 만 (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>항목 저장...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>숨기기(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>검색기록을 파일로 저장합니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>텍스트파일(*.txt);;모든 파일(*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>검색기록 저장을 완료했습니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>저장 오류: </translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>환영합니다!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>파일(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>편집(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>도움말(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>검색창(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>검색결과 탐색창(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>설정...(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>보기(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>글자크기(&amp;Z)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>검색기록(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>검색</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>검색기록창(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>사전...(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>홈페이지(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>정보(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>골든딕 정보</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation>골든딕 도움말</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>프로그램 종료</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>포럼(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>트레이로 닫기(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>창을 트레이로 최소화합니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>검색항목 저장(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>검색항목을 저장합니다</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>인쇄(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>페이지 설정(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>인쇄 미리보기(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>파일 다시 읽기(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>새 탭(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>항상 위에(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>항상 위에</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>메뉴 단추</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>페이지 내 검색</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>전문검색</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>기록 비우기(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>새 탭</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>설정폴더 열기(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>보이기(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>내보내기(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>불러오기(&amp;I)</translation>
     </message>
@@ -2508,12 +2977,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>사전파일이 훼손되었습니다</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>%1에서 항목을 표시하지 못함, 이유: %2</translation>
     </message>
@@ -2521,7 +2990,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 문법오류: %2행 %3열에서 %1</translation>
     </message>
@@ -2529,7 +2998,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 문법오류: %2행 %3열에서 %1</translation>
     </message>
@@ -2537,22 +3006,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>활성</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>주소</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>아이콘</translation>
     </message>
@@ -2565,88 +3034,94 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>사전 순서:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>비활성(사용중지) 사전:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>사전 정보</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>총항목:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>총어휘:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>검색언어:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>번역언어:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>설명:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>사전의 구성파일:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>마우스끌기로 순서를 조정하십시오. 사전을 사용하지 않으려면 비활성 그룹으로 옮기십시오.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>이름순 정렬</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>언어순 정렬</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>사전 표제어</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation>사용중: %1, 사용중지: %2</translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>   경로</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>   하위 폴더 검색</translation>
     </message>
@@ -2756,14 +3231,14 @@
         <translation>더블클릭으로 단어 검색</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>기본값으로 스캔팝업모드를 켤 것인지 설정합니다. 이 항목을 선택하면,
 프로그램이 시작할 때 항상 스캔팝업기능이 활성화됩니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2777,27 +3252,27 @@
 단어를 선택한 직후에 눌러도 동일한 기능을 합니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>단축키</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>메인창 보이기/감추기를 위해 다음 단축키를 사용합니다:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>단어를 클립보드에 복사하여 검색할 때 다음 단축키를 사용합니다:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>단축키는 전역(Global) 키이므로 골든딕이 배경에서 실행중이면 모든 프로그램, 상황에서 작동합니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>스캔팝업(&amp;S)</translation>
     </message>
@@ -2849,17 +3324,22 @@
         <translation>Add-on 스타일:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation>도움말 언어</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>컨텍스트메뉴가 너무 커지지 않게 이 값을 조정합니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>컨텍스트메뉴 사전 한도:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2869,134 +3349,134 @@
 메인창이나 트레이 아이콘에서 기능을 시작/중지할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>스캔팝업 기능을 활성화합니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>프로그램 시작시 스캔팝업 활성화</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>이 항목을 선택하면 마우스가 다른 단어 위로 이동할 때 설정된 모든 키가 
 눌려진 상태에서만 팝업이 나타납니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>선택한 모든 키가 눌러진 상태일 때만 팝업창을 보입니다:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>왼쪽 Ctrl 키만</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>왼쪽 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>오른쪽 Shift 키만</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>오른쪽 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt 키</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Ctrl 키</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>왼쪽 Alt 키만</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>왼쪽 Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Shift 키</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>오른쪽 Alt 키만</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>오른쪽 Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>오른쪽 Ctrl 키만</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>오른쪽 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>왼쪽 Shift 키만</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>왼쪽 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>윈도우 단축키 또는 메타 키</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>키를 나중에 입력하는 것을 허용합니다:  이내</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3004,47 +3484,82 @@
 다음에 지정된 시간 동안에만 감시됩니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>초 이내</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>검색내용을 팝업창에 표시하지 않고 메인창으로 보냅니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>검색내용을 메인창에 표시</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>오디오 파일 재생시 FFmpeg(libav)와 libao 사용</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>내장 플레이어 사용</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>시스템 Proxy</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>사용자 Proxy</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>사용자 설정</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>전문검색</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>전문검색을 허용:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>항목수가 다음을 초과시 검색하지 않음 : </translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>항목 (0 - 무제한)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>이 옵션을 선택하면 표시내용이 많은 항목을 자동으로 접히게 하여 숨깁니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>자동으로 숨길 항목의 크기: </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>항목의 크기가 이 값을 초과 하면 내용을 접어 표시합니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>자 이상</translation>
     </message>
@@ -3059,17 +3574,17 @@
         <translation type="obsolete">Bass library를 통해 재생</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>고급(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>스캔팝업 추가기능</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3080,12 +3595,12 @@
 그런 프로그램을 사용하지 않는다면 이 옵션을 선택할 필요가 없습니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>IAccessibleEx 사용(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3094,12 +3609,12 @@
 그런 프로그램을 사용하지 않는다면 이 옵션을 선택할 필요가 없습니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>UIAutomation 사용(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3108,67 +3623,67 @@
 그런 프로그램을 사용하지 않는다면 이 옵션을 선택할 필요가 없습니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>GoldenDict message 사용(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>검색기록</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>이 항목을 선택하면 사전의 검색기록을 저장합니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>기록 저장(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>검색기록에 저장할 최대 항목수를 지정하십시오.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>검색기록 최대크기:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>검색기록을 자동으로 저장하는 간격. 0으로 지정하면 종료시에만 저장됩니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>저장 간격: </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>분 마다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>검색내용</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>이 항목을 선택하면 사전의 옵션항목을 항상 확장하여 보여줍니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>옵셕항목 확장(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3181,27 +3696,27 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Note: RECORD extension이 작동하지 않는 X.Org XServer를 구동하고 있는 것 같습니다. 골든딕의 단축키가 아마 작동하지 않을 것입니다. 다음의 &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;버그 항목&lt;/span&gt;&lt;/a&gt;을 참고하고 &lt;span style=&quot; color:#ff0000;&quot; 원한다면 댓글을 남겨 주십시오.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>음성(&amp;А)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>발음</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>메인창에서 발음 자동 재생</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>스캔팝업창에서 발음 자동 재생</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>재생</translation>
     </message>
@@ -3226,59 +3741,59 @@
         <translation type="obsolete">Phonon을 통해 재생</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>외부 프로그램을 통하여 음성을 재생합니다</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>외부 프로그램 사용:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>네트워크(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>프로그램의 모든 네트워크 요청에 대해 proxy 서버를
 사용하기 원하면 이 항목을 선택하십시오.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Proxy 서버 사용</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>종류:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>호스트:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>포트:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>사용자:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>암호:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3287,12 +3802,12 @@
 보인다면 이 항목을 해제해 보십시오.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
-        <translation>사이트 외부 자료 허용 안함(대부분의 광고 차단)</translation>
+        <translation>사이트 외부 자료 허용 안함(대부분의 광고를 차단함)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3301,24 +3816,24 @@
 플러그인이 작동하기 위해서는 미리 설치되어 있어야 합니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>웹 플러그인 허용</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>일부 사이트는 HTTP 헤더를 통해서 GoldenDict을 탐지하여 요청을 블록합니다.
 이런 문제를 우회하려면 옵션을 선택하십시오.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>HTTP 헤더에 GoldenDict을 표시하지 않음</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3329,42 +3844,43 @@
 안내합니다.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>정기적으로 업데이트 검사</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>시스템 기본값</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>기본값</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3373,12 +3889,12 @@
         <translation type="obsolete">DirectShow를 통해 재생</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>언어 변경</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>언어변경을 적용하려면 프로그램을 다시 시작하십시오.</translation>
     </message>
@@ -3386,27 +3902,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>텍스트</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>접두사 검색</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>모름</translation>
     </message>
@@ -3432,27 +3948,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>활성</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>종류</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>명령행</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>아이콘</translation>
     </message>
@@ -3460,12 +3976,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>사전항목 로딩 오류</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>사전항목 디코딩 오류</translation>
     </message>
@@ -3576,18 +4094,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>오류: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>리소스 저장 오류: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>참조할 리소스를 다운로드하지 못했습니다.</translation>
     </message>
@@ -3595,12 +4113,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>히가라나의 햅번식 로마자 표기법</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>가타가나 햅번식 로마자 표기법</translation>
     </message>
@@ -3621,59 +4139,59 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>뒤로</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>앞으로</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>발음 듣기(Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>단어를 메인창으로 보냅니다(Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>사전도구상자를 보이거나 숨깁니다</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>핀 아이콘을 선택하면 창을 항상 화면 맨 위에 표시하고, 
 팝업창 크기, 사전모음의 위치 등을 조절할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3681,17 +4199,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>경로</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>아이콘</translation>
     </message>
@@ -3699,45 +4217,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>음성 합성</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(포터블 버전에서는 설정할 수 없습니다)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>폴더 선택</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>삭제 확인</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt;폴더를 목록에서 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt;사이트를 목록에서 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>프로그램 &lt;b&gt;%1&lt;/b&gt;을 목록에서 삭제하시겠습니까?</translation>
     </message>
@@ -3756,7 +4276,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>추가...(&amp;A)</translation>
     </message>
@@ -3765,7 +4286,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>제거(&amp;R)</translation>
     </message>
@@ -3835,7 +4357,7 @@
         <translation type="obsolete">또 다른 방법으로 CP1251코드에는 %GD1251%, ISO 8859-1코드에는 %GDISO1%를 대신 쓸 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>프로그램</translation>
     </message>
@@ -3844,12 +4366,12 @@
         <translation type="obsolete">외부 프로그램. 문자열 %GDWORD%는 검색어로 대체되어 표준 입력으로 전달됩니다.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>&lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;에서 라이브 음성 듣기. 이 사이트에서는 누구나 자기 목소리로 세계 각 언어의 단어들을 녹음하고 공유할 수 있는 기능을 제공하고 
 있으며. 그것들을 골든딕에서 연결하여 들을 수 있습니다.
@@ -3857,17 +4379,17 @@
 </translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Forvo에서 발음 듣기 사용</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API 키:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3876,7 +4398,7 @@
 개인키를 얻으려면 사이트에 등록하십시오.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>별도의 개인키를 &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;여기&lt;/a&gt;서 얻거나, 비워두고 기본키를 사용하십시오.</translation>
     </message>
@@ -3907,79 +4429,89 @@
 GBK와 GB18030 → %GDGBK%, Shift-JIS → %GDSHIFTJIS%</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation>DICT 서버</translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation>DICT 서버:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>외부 프로그램. 문자열 %GDWORD%는 검색어로 대체됩니다. 그런 문자열이 제시되지 않으면 단어는 표준 입력으로 전달됩니다.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>언어코드 (콤마로 구분):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>사용할 언어코드 목록. 예: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>언어코드의 전체목록은 &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;여기&lt;/a&gt;서 얻을 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>문자변환</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>러시아어 문자변환</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>그리스어 문자변환</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>독일어 문자변환</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>벨라루스어 문자변환</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>알파벳으로 일본어를 입력할 수 있게 합니다</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>일본어 로마자 입력</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>로마자 표기법:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>가장 널리 사용되는 일본어 로마자 표기방법으로서, 
 영어 음성학을 기초로 하고 있습니다 </translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>헵번식</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3990,12 +4522,12 @@
 골든딕에는 아직 도입되어 있지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>일본식</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4006,32 +4538,32 @@
 골든딕에는 아직 도입되어 있지 않습니다.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>훈령식</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>문자표:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>히라가나 일본어 문자표</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>히라가나</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>가타가나 일본어 문자표</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>가타가나</translation>
     </message>
@@ -4171,22 +4703,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>활성</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>주소</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>아이콘</translation>
     </message>
@@ -4194,7 +4726,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>일부 사전의 검색에 실패했습니다.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/lt_LT.ts goldendict-1.5.0~git20150923/locale/lt_LT.ts
--- goldendict-1.5.0~git20131003/locale/lt_LT.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/lt_LT.ts	2015-09-23 08:26:24.000000000 +0000
@@ -2,13 +2,6 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="lt">
 <context>
-    <name></name>
-    <message>
-        <source>XML parse error: %1 at %2,%3</source>
-        <translation type="obsolete">Ошибка обработки XML: %1 на строке %2, столбце %3</translation>
-    </message>
-</context>
-<context>
     <name>About</name>
     <message>
         <location filename="../about.ui" line="17"/>
@@ -49,7 +42,7 @@
         <translation>[Nežinoma]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Naudoja Qt %1 (%2, %3 bitų)</translation>
     </message>
@@ -57,62 +50,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Išplėsti</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Suskleisti</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; vertimas nerastas grupėje &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Gupėje &lt;b&gt;%1&lt;/b&gt; vertimų nerasta.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Jus sveikina GoldenDict!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Jus sveikina &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Dirbti žodynu pradėkite spausdami &lt;b&gt;Taisa &gt; Žodynai&lt;/b&gt; – nurodysite kelius, kur ieškoti žodynų failų, nurodysite įvairias Vikipedijos svetaines ar kitus šaltinius, pasirinksite žodynų tvarką arba kursite žodynų grupes.&lt;p&gt;Po to jau galėsite ieškoti žodžių! Versti žodžius galite tiek GoldenDict programos pagrindiniame lange, tiek &lt;a href=&quot;Iškylantys langai&quot;&gt;kitose veikiančiose programose&lt;/a&gt;. &lt;p&gt;Programą galite derinti per meniu &lt;b&gt;Taisa &gt; Nuostatos&lt;/b&gt;. Visos nuostatos turi paaiškinimus - jie pravers, jei abejosite, ar nežinosite.&lt;p&gt;Jei reikia daugiau pagalbos, turite klausimų, pasiūlymų ar tiesiog norite sužinoti kitų nuomonę, apsilankykite programos &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;diskusijų puslapyje&lt;/a&gt;.&lt;p&gt;Programos atnaujinimų ieškokite &lt;a href=&quot;http://goldendict.org/&quot;&gt;GoldenDict svetainėje&lt;/a&gt;. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. GPLv3 arba vėlesnė licencija.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Iškylantys langai</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Iškylantys langai&lt;/h3&gt;Norėdami žodžių ieškoti kitose veikiančiose programose, pirmiausia turite &lt;b&gt;Nuostatose&lt;/b&gt; įgalinti &lt;i&gt;„iškylančius langus“&lt;/i&gt;, o po to bet kada spragtelėti „iškylančių langų“ ženkliuką viršuje arba spustelėti sistemos dėklo ženkliuką dešiniu pelės klavišu ir pasirinkti atitinkamą meniu įrašą. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Tuomet kokioje nors programoje užveskite žymeklį ties norimu ieškoti žodžiu – netrukus pasirodys iškylantis langas su pasirinkto žodžio apibūdinimu.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Tuomet kokioje nors programoje tiesiog pele pažymėkite bet kokį norimą žodį (dukart jį spragtelėkite arba braukite jį nuspaudę pelės klavišą) – netrukus pasirodys iškylantis langas su pasirinkto žodžio apibūdinimu.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(bevardis)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(paveikslėlis)</translation>
     </message>
@@ -120,37 +113,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Išplėsti</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation> </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Suskleisti</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Užklausos klaida: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Panašūs žodžiai: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Žodžių junginiai: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Pavieniai žodžiai: </translation>
     </message>
@@ -158,47 +151,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Dabartinio straipsnio pasirinkimas</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Kopijuoti kaip tekstą</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Tyrinėti</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Šaltinis</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Garsas</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS balsas</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Paveikslėlis</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>„%1“ žodyne esantis apibrėžimas: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Apibrėžimas: %1</translation>
     </message>
@@ -207,99 +200,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Nurodyto šaltinio nėra.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Nėra nurodytos garso programos.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>Klaida: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Įrašyti garsą</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Garsai (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Visos rinkmenos (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Įrašyti paveikslą</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Paveikslai (*.bmp *.jpg *.png *.tif);;Visi failai (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Atverti nuorodą</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Vaizdo klipas</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Vaizdo klipas: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Atverti nuorodą naujoje &amp;kortelėje</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Atv&amp;erti nuorodą naršyklėje</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Ieškoti „%1“</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Ieškoti „%1“ &amp;naujoje kortelėje</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>„%1“ siųsti į įvedimo eilutę</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>žodį „%1“ į&amp;traukti į žurnalą</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Ieškoti „%1“ grupėje %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Ieškoti „%1“ grupėje %2 &amp;naujoje kortelėje</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>Įspėjimas: FFmpeg garso grutuvė: %1</translation>
     </message>
@@ -320,37 +314,37 @@
         <translation type="obsolete">„Bass“ biblioteka negali groti šio garso.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Nepavyko paleisti grotuvo garso failui atkurti: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Nepavyko sukurti laikinojo failo.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Nepavyko automatiškai atverti šaltinio failo, mėginkite rankiniu būdu: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Nepavyko parsiųsti nurodytų šaltinių.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Įrašti pa&amp;veikslą...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Įrašyti g&amp;arsą...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ĮSPĖJIMAS: %1</translation>
     </message>
@@ -360,42 +354,44 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>tuščias</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Ieškoti:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Ankstesnis</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Tolesnis</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Vald+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Skirti raidžių dydį</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>&amp;Viską pažymėti</translation>
     </message>
@@ -420,6 +416,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>Reikia prisijungti per įgaliotąjį serverį</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>Norėdami naudotis įgaliotuoju serveriu, įveskite naudotojo vardą  ir slaptažodį</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>Naudotojo vardas:</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>Slaptažodis:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -520,6 +539,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>Paieškos veiksena</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>Šis elementas nurodo, kaip bus interpretuojama atrankos užklausa</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>Jei pažymėta, atrenkant bus atsižvelgiama į raidžių lygį</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>Skirti raidžių registrą</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>Antraštinius žodžius eksportuoti į failą</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>Eksportuoti</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>Gerai</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>Norėdami atrinkti antraštinius žodžius pagal atrankos filtrą, paspauskite šį mygtuką</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>Pritaikyti</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>Jei pažymėta, pakeitus atrankos tekstą iš karto atrinkti antraštinius žodžius</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>Atrinkti rašant</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>Atranka:</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>Tekstas, pagal kurį norite atrinkti antraštinius žodžius (tikslus tekstas, pakaitos simboliai, reguliarusis reiškinys)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>Tekstas</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>Pakaitos simboliai</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>Reguliarusis reiškinys</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>Iš viso nesikartojančių antraštinių žodžių: %1; atrinkta: %2</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>Antraštinių žodžių įrašymas į failą</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>Tekstiniai failai (*.txt);;Visi failai (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>Antraštinių žodžių eksportavimas...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>Atšaukti</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -562,6 +694,16 @@
         <translation>Aprašas:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>Rodyti visus nesikartojančius žodyno antraštinius žodžius</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>Antraštiniai žodžiai</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -578,6 +720,76 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation>Url: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation>Duombazės: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation>Paieškos strategijos: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation>Įgalinta</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation>Vardas</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation>Adresas</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation>Duombazės</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation>Strategijos</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation>Ženkliukas</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>Duombazes atskirkite kableliais
+(tuščias įrašas ir * atitinka visas duomenų bazes)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation>Paieškos strategijas atskirkite kableliais
+(tuščias įrašas atitinka priešdėlio („prefix“) strategiją)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -599,17 +811,22 @@
         <translation>Keisti šią grupę</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Informacija apie žodyną</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>Žodyno antraštiniai žodžiai</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Atverti žodyno aplanką</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Keisti žodyną</translation>
     </message>
@@ -617,39 +834,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Šaltiniai</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Žodynai</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupės</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Šaltiniai pasikeitė</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Kai kurie šaltiniai pasikeitė. Priimti pakeitimus?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Priimti</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Atšaukti</translation>
     </message>
@@ -668,6 +885,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>Nieko</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>Visatekstė paieška</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>Ištisi žodžiai</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>Grynasis tekstas</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>Pakaitos simboliai</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>Reguliar. reiškinys</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>Didžiausias atstumas tarp žodžių (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>Straipsnelių riba vienam žodynui (%1-%2): </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>Surasta straipsnelių: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>Darbar indeksuojama: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>Kinų, japonų ir korėjiečių rašto ženklų paieška nėra suderinama su paieškos veiksenomis „Ištisi žodžiai“ ir „Grynasis tekstas“</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation>Paieškos užklausoje įveskite bent vieną žodį, kurį sudarytų bent </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation> simboliai(-ių,-is)</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>Nėra žodynų, palaikančių paiešką jų straipsnelių turinyje</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>Nieko</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -706,6 +1009,69 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>Paieška</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>Skirti raidžių registrą</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>Veiksena:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>Surasta straipsneliuose:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>Prieinamos žodynų grupės:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>Indeksavimo eilėje:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-indexable:</source>
+        <translation type="obsolete">Neindeksuojami:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>Iš viso:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>Suindeksuoti:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>Dabar indeksuojama: nieko</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>Atšaukti</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -745,43 +1111,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>Grupės kortelės</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>Atverti grupių sąrašą</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Pridėti grupę</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Pavadinkite naująją grupę:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Pervadinti grupę</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Naujas grupės pavadinimas:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Pašalinti grupę</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Tikrai norite pašalinti &lt;b&gt;%1&lt;/b&gt; grupę?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Pašalinti visas grupes</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Tikrai norite pašalinti visas grupes?</translation>
     </message>
@@ -882,6 +1258,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Atgal</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Pirmyn</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Padidinti</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Sumažinti</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Įprastas dydis</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -912,12 +1336,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Rašybos spėjimas: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 (morfologija)</translation>
     </message>
@@ -925,12 +1349,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Įgalinta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Pavadinimas</translation>
     </message>
@@ -1970,7 +2394,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Žodynų įkelti nepavyko</translation>
     </message>
@@ -1978,7 +2402,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Klaida konfgūracijoje. Tęsti naudojant numatytąsias nuostatas?</translation>
     </message>
@@ -1990,78 +2414,85 @@
         <translation type="obsolete">Navigacija</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Atgal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Pirmyn</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Iškylantis langas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Rodyti &amp;pagrindinį langą</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Baigti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Įkeliama...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>Žodynuose ieškomas tekstas. Galite naudoti pakaitos simbolius „*“, „?“ ir simbolių rinkinį „[...]“.
+Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įveskite „\*“, „\?“, „\[“, „\]“</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Praleisti šią versiją</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Jūs paslepiate meniu juostą. Norėdami ją vėl matyti, spauskite %1.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Vald+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Puslapio parinktys</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Nera jokio spausdintuvo. Įdiekite kokį nors.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Spausdinti straipsnį</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Visas straipsnis (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Straipsnis, tik HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Įrašyti straipsnį kaip</translation>
     </message>
@@ -2070,44 +2501,44 @@
         <translation type="obsolete">Html rikmenos (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Klaida</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Nepavyksta įrašyti straipsnio: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>Žodynų: %1, straipsnių: %2, žodžių: %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Nepavyko paruošti sparčiųjų klavišų stebėjimo mechanizmo&lt;br&gt;Įsitikinkite, kad XServer turi įjungtą RECORD plėtinį.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Yra nauja versija</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Galite parsisųstiGoldenDict &lt;b&gt;%1&lt;/b&gt; versiją.&lt;br&gt;
 Norėdami atverti parsisiuntimo puslapį, spauskite &lt;b&gt;Parsisiųsti&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Parsisiųsti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Ieškoti grupėje:</translation>
     </message>
@@ -2120,108 +2551,108 @@
         <translation type="obsolete">Įrankių juostoje rodyti mažus ženkliukus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Meniu juosta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Rasta žodynuose:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Ištarti žodį (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>&amp;Pavadinimai žodynų juostoje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Įran&amp;kių juostoje maži ženkliukai</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>Pagri&amp;ndiniai mygtukai</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Padidinti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Sumažinti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Įprastas dydis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Padidinti žodžius</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Sumažinti žodžius</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Įprastas žodžių dydis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Užverti veikiamąją kortelę</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Užverti visas korteles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Užverti visas korteles, iškyrus veikiamąją</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Ieškoti:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Visi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>API prieinamumui nėra įgalinta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Įrašomas straipsnis...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Pagrindinis langas visada rodomas virš kitų programų langų.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Įkelti žurnalą iš failo</translation>
     </message>
@@ -2230,52 +2661,57 @@
         <translation type="obsolete">Įkelti iš failo: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Klaida įkeliant: failo duomenys netinkami</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Įkėlimas į žurnalą baigtas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Klaida įkeliant: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Informacija apie žodyną</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>Žodyno antraštiniai žodžiai</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Atverti žodyno aplanką</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Keisti žodyną</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Atvertos kortelės</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Atverti kortelių sąrašą</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(nepavadinta)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2284,7 +2720,7 @@
         <translation type="obsolete">Įspėjimas: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Slėpti</translation>
     </message>
@@ -2293,23 +2729,23 @@
         <translation type="obsolete">Žurnalo rodymas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Žurnalą įrašyti į failą</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Tekstiniai failai (*.txt);;Visi failai (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Žurnalas įrašytas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Eksporto klaida:</translation>
     </message>
@@ -2319,22 +2755,22 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Jus sveikina GoldenDict!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Failas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Taisa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Pagalba</translation>
     </message>
@@ -2347,12 +2783,12 @@
         <translation type="obsolete">Žo&amp;dynai...    F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Nuostatos...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
@@ -2361,163 +2797,193 @@
         <translation type="obsolete">&amp;Grupės...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>Ro&amp;dymas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>M&amp;astelis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>Ž&amp;urnalas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>Žo&amp;dynai...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Paieškos polangis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>Paieška</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Ž&amp;odynų polangis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Žurnalo polangis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Svetainė</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Apie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Apie GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Užverti programą</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Vald+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Diskusijos internete</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>Nuleisti &amp;langą</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Nuleisti į sistemos dėklą</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Vald+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>Į&amp;rašyti straipsnį</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Įrašyti straipsnį</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Spausdinti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Vald+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Puslapio parinktys</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Spaudinio p&amp;eržiūra</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Perž&amp;velgti failus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nauja kortelė</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Visada viršuje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Visada viršuje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Vald+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Meniu mygtukas</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>Ieškoti puslapyje</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Vald+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>Visatekstė paieška</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Vald+Lyg2+F</translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Spaudinio peržiūra</translation>
     </message>
@@ -2526,48 +2992,48 @@
         <translation type="obsolete">Peržvelgti failus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Vald+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>Iš&amp;valyti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nauja kortelė</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Vald+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Nuostatų aplankas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>Ro&amp;dyti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Vald+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>Į&amp;rašyti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>Į&amp;kelti</translation>
     </message>
@@ -2579,12 +3045,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Žodyno failas sugadintas</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Nepavyko įkelti straipsnio iš %1 dėl to, kad %2</translation>
     </message>
@@ -2592,7 +3058,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML nagrinėjimo klaida: %1 ties %2,%3</translation>
     </message>
@@ -2600,7 +3066,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML nagrinėjimo klaida: %1 ties %2,%3</translation>
     </message>
@@ -2608,22 +3074,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Įgalinta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Pavadinimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adresas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ženkliukas</translation>
     </message>
@@ -2636,88 +3102,94 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Žodynų tvarka:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Nenaudojami (uždrausti) žodynai:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Žodyno informacija</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Pavadinimas:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Iš viso straipsnių:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Iš viso žodžių:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Verčia iš:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Verčia į:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Aprašas:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Žodyną sudarantys failai:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Žodynų tvarką pakeisite tiesiog juos tempdami. Norėdami uždrausti žodyną, tiesiog nutempkite jį į neaktyviųjų grupę.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Rikiuoti pagal pavadinimą</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Rikiuoti pagal kalbą</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>Žodyno antraštiniai žodžiai</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Kelias</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Rekursinis</translation>
     </message>
@@ -2875,24 +3347,29 @@
         <translation>Papildomas stilius:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Šią reikšmę keiskite tam, kad išvengtumėte didelių kontekstinių meniu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Žodynų kiekio riba kontekstiniame meniu:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Nurodykite, ar ši iškylančių langų funkcija yra numatytoji.
 Jei pažymėta, iškylančių langų funkcija bus įjungta vos paleistoje programoje.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2903,27 +3380,27 @@
 praėjus trupučiui laiko po to, kai baigėte žymėti.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Spartieji klavišai</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Nuspaudus spartųjį klavišą parodyti ar paslėpti pagrindinį langą:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Nuspaudus spartųjį klavišą išversti iškarpinės turinį:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Spartieji klavišai yra bendri sitemai ir veikia dirbant bet kuria programa, bet kokioje aplinkoje, kol fone paleistas GoldenDict žodynas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Iškylantis langas</translation>
     </message>
@@ -2933,7 +3410,7 @@
         <translation>GoldenDict paleisti kartu su naudotojo darbalaukiu sistemos paleidimo metu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2944,7 +3421,7 @@
 pagrindiniame lange arba nuspaudę ženkliuką sistemos dėkle.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Įgalinti iškylančius langus</translation>
     </message>
@@ -2954,159 +3431,194 @@
         <translation type="obsolete">Nurodykite, ar iškylančių langų funkcija bus įjungta vos paleistoje programoje.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Paleisti su įjungta iškylančių langų funkcija</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Jei įgalinta, langas su vertimu iškils tik nuspaudus visus nurodytus klavišus
 po to, kai pasikeis pažymėtas žodis.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Iškylantis langas pasirodys tik nuspaudus visus šiuos klavišus:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Tik kairysis Vald</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Kairysis Vald</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Tik dešinysis Lyg2</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Dešinysis Lyg2</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt klavišas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Vald klavišas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Vald</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Tik kairysis Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Kairysis Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Lyg2 klavišas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Lyg2</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Tik dešinysis Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Dešinysis Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Tik dešinysis Vald</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Dešin. Vald</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Tik kairysis Lyg2</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Kairysis Lyg2</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows arba Meta klavišas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win arba Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Žodžio vertimas pagrindiniame lange, o ne iškylančiame lange</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Perduoti į pagrindinį langą</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Grojimas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Garsus leisti per FFmpeg(libav) ir libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Naudoti vidinę grotuvę</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>Sistemos įgaliotasis serveris</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>Savitas įgaliotasis serveris</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>Savitos nuostatos</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>Visatekstė paieška</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>Leisti ieškoti šių žodynų straipsneliuose:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>Neieškoti, jei žodyne yra virš</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>straipsnelių(-io) (0 = neriboti)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Automatiškai suskleisti didelius straipsnius</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Suskleisti straipsnis didesnius nei</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Suskleisti straipsnis, kurių dydis viršija</translation>
     </message>
@@ -3115,7 +3627,7 @@
         <translation type="obsolete">Suskleisti straipsnis, kurių dydis viršija</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>simboliai</translation>
     </message>
@@ -3150,39 +3662,39 @@
         <translation type="obsolete">Garsą leisti per „Bass“ biblioteką</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Naudoti bet kokią išorinę programą garso failų grojimui</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Naudoti išorinę programą:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Kai kurios svetainės aptinka GoldenDict pagal HTTP antraštę ir dėl to blokuoja užklausas.
 Ši parinktis leidžia apeiti problemą.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>HTTP antraštėse neidentifikuoti GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Su&amp;dėtingesni</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Ypatingos iškylančių langų technologijos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3193,12 +3705,12 @@
 Nereikia šios parinkties rinktis, jei tokių programų nenaudojate.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Naudoti „&amp;IAccessibleEx“</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3207,12 +3719,12 @@
 Nereikia šios parinkties rinktis, jei tokių programų nenaudojate.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Naudoti „&amp;UIAutomation“</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3221,62 +3733,62 @@
 Nereikia šios parinkties rinktis, jei tokių programų nenaudojate.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Naudoti „&amp;GoldenDict message“</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Žurnalas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Įgalinkite, jei norite įsiminti verčiamus žodžius</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Įsi&amp;minti verstus žodžius</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Nurodykite didžiausią leistiną žurnalo įrašų kiekį.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Žurnalo įrašų didžiausias kiekis:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Žurnalo įrašymo dažnumas. 0 reiškia įrašymą tik užveriant programą.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Įrašyti kas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Straipsneliai</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Įgalinkite, jei norite visada matyti visas straipsnelio dalis</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Išplėsti papildomas &amp;dalis</translation>
     </message>
@@ -3290,12 +3802,12 @@
 praėjus trupučiui laiko po to, kai baigėte žymėti.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Klavišai gali būti paspausti per</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3304,12 +3816,12 @@
 baigimo žymėti. Laiką nurodykie čia.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3322,22 +3834,22 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Pastaba: regis naudojate X.Org XServerio versiją, kurios RECORD plėtinys yra sugadintas. Spartieji klavišai GoldenDict programai greičiausiai neveiks. Tai pirmiausia turėų būti ištaisyta pačiame Xserveryje. Žiūrėkite pranešimą apie &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ydą&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; bei, jei norite, palikite savo komentarą .&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Garsas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Tarimas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Automatiškai ištarti pagrindinio lango žodžius</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Automatiškai ištarti iškylančio lango žodžius</translation>
     </message>
@@ -3346,61 +3858,61 @@
         <translation type="obsolete">Garso rinkmenas groti su programa:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Tinklas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Įgalinkite, jei norite programos visoms tinklo
 užklausoms naudoti įgaliotąjį serverį.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Naudoti įgaliotąjį serverį</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipas:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Serveris:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Prievadas:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Naudotojo vardas:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Slaptažodis:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
         <translation>Įgalinus šią parinktį, GoldenDict blokuos didžiąją dalį reklamos, neleisdama turinio (paveikslėlių, kadrų) esančio iš kito šaltinio, nei jūsų naršomas puslapis. Jei kuri svetainė neveiks su šia parinktimi, ją išjunkite.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Neleisti įkelti turinio iš kitų svetainių (dažniausiai reklamos)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3409,12 +3921,12 @@
 saityno papildinį. Norint, kad parinktis veiktų, turi būti įdiegtas papildinys.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Įgalinti saityno papildinius</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3427,12 +3939,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Periodiškai tikrinti, ar yra naujų programos versijų</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Sistemoje numatyta</translation>
     </message>
@@ -3445,32 +3957,33 @@
         <translation type="obsolete">Rusų</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Numatytasis</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Šiuolaikinis</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes mėlynas</translation>
     </message>
@@ -3479,12 +3992,12 @@
         <translation type="obsolete">Groti per DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Kalbos keitimas</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Naująją kalbą programa naudos po to, kai ją atversite iš naujo.</translation>
     </message>
@@ -3492,27 +4005,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Garsas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Paprastas tekstas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Priešdėlio atitikimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Nežinoma</translation>
     </message>
@@ -3538,27 +4051,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Įgalinta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Tipas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Pavadinimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Komandinė eilutė</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ženkliukas</translation>
     </message>
@@ -3566,12 +4079,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Straipsnio įkėlimo klaida</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Straipsnio dekodavimo klaida</translation>
     </message>
@@ -3682,18 +4197,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>Klaida: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Šaltinių įrašymo klaida: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Nepavyko parsiųsti nurodytų šaltinių.</translation>
     </message>
@@ -3701,12 +4216,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji (Hiragana)</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji (Katakana)</translation>
     </message>
@@ -3731,12 +4246,12 @@
         <translation type="obsolete">žodis</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Atgal</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Pirmyn</translation>
     </message>
@@ -3749,43 +4264,43 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Ištarti žodį (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Perduoti į pagrindinį langą (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Parodo arba paslepia žodynų juostelę</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Naudokite, jei norite pritvirtinti šį langą. Tuomet jis nepradigs patrukus pelę, 
 galėsite keisti lango dydį ar atlikti kitus įprastus langų tvarkymo veiksmus.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3794,8 +4309,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3803,17 +4318,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Kelias</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Pavadinimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ženkliukas</translation>
     </message>
@@ -3821,45 +4336,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Balso sintezavimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(neprieinama perkeliamoje versijoje)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Pasirinkite aplanką</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Šalinimo patvirtinimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Aplanką &lt;b&gt;%1&lt;/b&gt; pašalinti iš sąrašo?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Svetainę &lt;b&gt;%1&lt;/b&gt; pašalinti iš sąrašo?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Programą &lt;b&gt;%1&lt;/b&gt; pašalinti iš sąrašo?</translation>
     </message>
@@ -3878,7 +4395,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>Pri&amp;dėti...</translation>
     </message>
@@ -3887,7 +4405,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Pašalinti</translation>
     </message>
@@ -3955,7 +4474,7 @@
         <translation type="obsolete">Taip pat galite naudoti %GD1251% (CP1251koduotei) arba %GDISO1% (ISO 8859-1 koduotei).</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programos</translation>
     </message>
@@ -3964,27 +4483,27 @@
         <translation type="obsolete">Bet kokia išorinė programa. Norėdami perduoti užklausos žodį, rašykite %GDWORD%. Žodis taip pat perduodamas į standartinę įvedimą.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Gyvų žmonių tarimas iš &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Šioje svetainėje asmenims siūloma įrašyti žodžių tarimą ir pasidalinti juo. GoldenDict leidžia pasinaudoti šiais ištekliais.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Įgalinti tarimą pagal Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API raktas</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3993,7 +4512,7 @@
 Deja, ateityje numatytasis raktas gali nebegalioti, tad siūlome užsiregistruoti ir įrašyti nuosavą raktą.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Savo asmeninį raktą gausite &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;čia&lt;/a&gt;. Norėdami naudoti numatytąjį, palikite laukelį tuščią.</translation>
     </message>
@@ -4023,79 +4542,89 @@
 %GDBIG5% – Big-5, %GDBIG5HKSCS% – Big5-HKSCS, %GDGBK% – GBK ir GB18030, %GDSHIFTJIS% – Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation>DICT serveriai</translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation>DICT serveriai:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Bet kokia išoriinė programa. „%GDWORD%“ eilutė (be kabučių) bus pakeista į užklausos žodį. Jei šios eilutės nebus, žodis bus perduotas į standartinį įvedimą.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Kalbų kodai (atskirti kableliais):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Norimų kalbų kodai. Pavyzdžiui: „en, ru, lt“.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Visas kalbų kodų sąrašas pateiktas &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;čia&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteracija</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Transliteracija (rusų)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Transliteracija (graikų)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Transliteracija (vokiečių)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Transliteracija (baltarusių)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Įgalinti rašymą japonų kalba naudojant lotynišką abėcėlę</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Romaji (japonų)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemos:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Dažniausiai naudojamas būdas japonų kalbai transkribuoti
 anglų kalbos fonologijos pagrindu</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4106,12 +4635,12 @@
 Dar neįtraukta į GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4122,32 +4651,32 @@
 Dar įtraukta į GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Skiemenų abėcėlė:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Japonų skiemenenų abėcėlė Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Japonų skiemenenų abėcėlė Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4292,22 +4821,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Įgalinta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Pavadinimas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adresas</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ženkliukas</translation>
     </message>
@@ -4315,7 +4844,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Kai kurių žodynų nepavyko užklausti.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/mk_MK.ts goldendict-1.5.0~git20150923/locale/mk_MK.ts
--- goldendict-1.5.0~git20131003/locale/mk_MK.ts	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/mk_MK.ts	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,4785 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="mk">
+<context>
+    <name>About</name>
+    <message>
+        <location filename="../about.ui" line="17"/>
+        <source>About</source>
+        <translation type="unfinished">За програмот</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="66"/>
+        <source>GoldenDict dictionary lookup program, version </source>
+        <translation type="unfinished">Речник GoldenDict, издание </translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="91"/>
+        <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
+        <translation>© Константин Исаков (ikm@goldendict.org), 2008-2011 {2008-2013 ?}</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="125"/>
+        <source>Credits:</source>
+        <translation type="unfinished">Заслуги:</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="101"/>
+        <source>Licensed under GNU GPLv3 or later</source>
+        <translation type="unfinished">Лиценца: GNU GPLv3 или понова</translation>
+    </message>
+    <message>
+        <location filename="../about.cc" line="17"/>
+        <source>[Unknown]</source>
+        <translation>[Непознато]</translation>
+    </message>
+    <message>
+        <location filename="../about.cc" line="34"/>
+        <source>Based on Qt %1 (%2, %3 bit)</source>
+        <translation type="unfinished">На база на Qt %1 (%2, %3 бита)</translation>
+    </message>
+</context>
+<context>
+    <name>ArticleMaker</name>
+    <message>
+        <location filename="../article_maker.cc" line="153"/>
+        <source>Expand article</source>
+        <translation type="unfinished">Откриј ја статијата</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="159"/>
+        <source>Collapse article</source>
+        <translation type="unfinished">Соберија  статијата</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="188"/>
+        <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+        <translation type="unfinished">Нема превод  &lt;b&gt;%1&lt;/b&gt;  пронајден во групата &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="193"/>
+        <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
+        <translation type="unfinished">Нема превод  пронајден во групата  &lt;b&gt;%1&lt;/b&gt; </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="241"/>
+        <source>Welcome!</source>
+        <translation type="unfinished">Добро дојдовте!</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="243"/>
+        <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
+        <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;Добро дојдовте во &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Ако за прв пат го стартирате овој програм, одредете ја патеката до речникот во &lt;b&gt;Уреди|Речник&lt;/b&gt;. Тука можете да наведете разни сајтови на Википедија или други извори на податоци, наместите го редоследот на речниците или направете речник.&lt;p&gt;по тоа, можете да почнете да барате зборови. Зборовите можат да се најдат во левото окно на прозорецот. Кога работите во други апликации, можете да барате зборови, користејќи &lt;a href=&quot;Работа со скокачки прозорец&quot;&gt;скокачкиот прозор&lt;/a&gt;. &lt;p&gt;во изборникот &lt;b&gt;Уреди|Поставки&lt;/b&gt;.Можете да ја наместите апликацијата по свој вкус. Сите параметри се наговестувања кои се прикажуваат кога преминувате преку нив. Обратете внимание на нив, кога имате проблеми со конфигурацијата.&lt;p&gt;Ако ви е потребна помош,било какви прашања, барања, итн, погледајте&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt; Форум на програмот&lt;/a&gt;.&lt;p&gt;Ажурирање софтвер достапно на  &lt;a href=&quot;http://goldendict.org/&quot;&gt;веб сајту&lt;/a&gt;.&lt;p&gt;© Константин Исаков (ikm@goldendict.org), 2008-2011. Лиценца: GNU GPLv3 или понова.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="259"/>
+        <source>Working with popup</source>
+        <translation type="unfinished">Работа со скан попап</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="261"/>
+        <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
+        <translation>&lt;h3 align=&quot;center&quot;&gt;Скокачки прозорец&lt;/h3&gt;За да пројдете зборови од друга апликација, потребно е да вклучите &lt;i&gt;«Овозможи скокачки прозор»&lt;/i&gt; у &lt;b&gt;Поставке&lt;/b&gt; и након тога омогућити искачуће дугме «Прегледај» у главном прозору или у пливајућем изборнику на икони у системској палети.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="268"/>
+        <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
+        <translation type="unfinished">Користећи сајт Forvo захтева кључ API. Оставите
+ово поље празно, да бисте користили подразумевани кључ, који
+не може да ради у будућности, или се пријавите на
+сајт, да бисте добили свој кључ.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="271"/>
+        <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
+        <translation type="unfinished">Користите интерфејс IAccessibleEx да тражи речи под курсором.
+Ова технологија ради само са програмима који га подржавају
+(например Internet Explorer 9).
+Ако не користите такве програме не треба да укључи ову опцију.</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="353"/>
+        <source>(untitled)</source>
+        <translation type="unfinished">(без име)</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="367"/>
+        <source>(picture)</source>
+        <translation>(слика)</translation>
+    </message>
+</context>
+<context>
+    <name>ArticleRequest</name>
+    <message>
+        <location filename="../article_maker.cc" line="634"/>
+        <source>Expand article</source>
+        <translation type="unfinished">&amp;Меморирај ја оваа статија</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="637"/>
+        <source>From </source>
+        <translation type="unfinished">Од: </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="642"/>
+        <source>Collapse article</source>
+        <translation type="unfinished">Соберија ја статијата</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="659"/>
+        <source>Query error: %1</source>
+        <translation type="unfinished">грешка во Прашање : %1</translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="765"/>
+        <source>Close words: </source>
+        <translation type="unfinished">Затвори зборови: </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="836"/>
+        <source>Compound expressions: </source>
+        <translation>Сложени изрази: </translation>
+    </message>
+    <message>
+        <location filename="../article_maker.cc" line="864"/>
+        <source>Individual words: </source>
+        <translation type="unfinished">Поединечни зборови: </translation>
+    </message>
+</context>
+<context>
+    <name>ArticleView</name>
+    <message>
+        <location filename="../articleview.cc" line="891"/>
+        <source>Resource</source>
+        <translation type="unfinished">Извори на промени</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="896"/>
+        <source>Audio</source>
+        <translation>Аудио</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="943"/>
+        <source>Definition: %1</source>
+        <translation type="unfinished">Дефиниција: %1</translation>
+    </message>
+    <message>
+        <source>GoldenDict</source>
+        <translation type="obsolete">GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="206"/>
+        <source>Select Current Article</source>
+        <translation type="unfinished">Одберете тековна статија</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="212"/>
+        <source>Copy as text</source>
+        <translation type="unfinished">Копирај како текст</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="218"/>
+        <source>Inspect</source>
+        <translation>Прегледај</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="901"/>
+        <source>TTS Voice</source>
+        <translation>TTS глас</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="906"/>
+        <source>Picture</source>
+        <translation>Слика</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="913"/>
+        <source>Video</source>
+        <translation>Видео</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="922"/>
+        <source>Video: %1</source>
+        <translation>Видео: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="939"/>
+        <source>Definition from dictionary &quot;%1&quot;: %2</source>
+        <translation type="unfinished">Дефиниција од речник &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
+        <source>The referenced resource doesn&apos;t exist.</source>
+        <translation type="unfinished">Бараниот ресурс не е пронајден.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1198"/>
+        <source>The referenced audio program doesn&apos;t exist.</source>
+        <translation type="unfinished">Бараниот аудио програм не е пронајден.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
+        <source>ERROR: %1</source>
+        <translation>ГРЕШКА: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1464"/>
+        <source>&amp;Open Link</source>
+        <translation type="unfinished">&amp;Отвори врска(линк)</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1470"/>
+        <source>Open Link in New &amp;Tab</source>
+        <translation type="unfinished">Отворете ја оваа врска во нова &amp;картичка</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1477"/>
+        <source>Open Link in &amp;External Browser</source>
+        <translation type="unfinished">Отвори ја врската во надворешен &amp;прегледувач</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1492"/>
+        <source>Save &amp;image...</source>
+        <translation type="unfinished">Сочувај &amp;слику...</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1500"/>
+        <source>Save s&amp;ound...</source>
+        <translation type="unfinished">Сочувај з&amp;вук...</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1519"/>
+        <source>&amp;Look up &quot;%1&quot;</source>
+        <translation type="unfinished">&amp;Побарај &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1527"/>
+        <source>Look up &quot;%1&quot; in &amp;New Tab</source>
+        <translation type="unfinished">Побарај «%1» во &amp;нова картичка</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1532"/>
+        <source>Send &quot;%1&quot; to input line</source>
+        <translation type="unfinished">Испрати &quot;%1&quot; во ред за внос</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
+        <source>&amp;Add &quot;%1&quot; to history</source>
+        <translation type="unfinished">&amp;Додади &quot;%1&quot; во историја</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1552"/>
+        <source>Look up &quot;%1&quot; in %2</source>
+        <translation type="unfinished">Побарај «%1» во %2</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1560"/>
+        <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
+        <translation type="unfinished">Побарај «%1» во %2 во &amp;нова картичка</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1704"/>
+        <source>Save sound</source>
+        <translation type="unfinished">Сочувај звук</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1706"/>
+        <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
+        <translation type="unfinished">Звучни датотеки (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Сите датотеки (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1719"/>
+        <source>Save image</source>
+        <translation type="unfinished">Сочувај слика</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1721"/>
+        <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
+        <translation type="unfinished">Слики датотеки (*.bmp *.jpg *.png *.tif);;Сите датотеке (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1852"/>
+        <source>WARNING: FFmpeg Audio Player: %1</source>
+        <translation type="unfinished">ВНИМАНИЕ: FFmpeg Audio Player: %1</translation>
+    </message>
+    <message>
+        <source>Playing a non-WAV file</source>
+        <translation type="obsolete">Репродукуј не WAV датотеку</translation>
+    </message>
+    <message>
+        <source>To enable playback of files different than WAV, please go to Edit|Preferences, choose the Audio tab and select &quot;Play via DirectShow&quot; there.</source>
+        <translation type="obsolete">Да бисте омогућили могућност да репродукујете датотеке типа, различитих од WAV, посетите Уреди|Поставке, изаберите картицу Аудио, а затим изаберите &quot;излаз звука преко DirectShow&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1793"/>
+        <source>Failed to run a player to play sound file: %1</source>
+        <translation type="unfinished">Не е можно да се пушти аудио датотека: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1811"/>
+        <source>Failed to create temporary file.</source>
+        <translation type="unfinished">Неуспешно креирање привремена датотека.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1822"/>
+        <source>Failed to auto-open resource file, try opening manually: %1.</source>
+        <translation type="unfinished">Грешка при отворање датотека ресурс , пробајте рачно да отворите: %1.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1845"/>
+        <source>The referenced resource failed to download.</source>
+        <translation type="unfinished">Не е можно вчитување на поврзани ресурси.</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="1845"/>
+        <source>WARNING: %1</source>
+        <translation type="unfinished">ПРЕДУПРЕДУВАЊЕ: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="54"/>
+        <source>about:blank</source>
+        <translation>about:blank</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="142"/>
+        <source>x</source>
+        <translation>x</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="132"/>
+        <source>Find:</source>
+        <translation type="unfinished">Побарај:</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
+        <source>&amp;Previous</source>
+        <translation type="unfinished">&amp;Претходен</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
+        <source>&amp;Next</source>
+        <translation type="unfinished">&amp;Следен</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="184"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="220"/>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished">&amp;Мали и големи букви </translation>
+    </message>
+    <message>
+        <location filename="../articleview.ui" line="197"/>
+        <source>Highlight &amp;all</source>
+        <translation type="unfinished">Нагласи &amp;се</translation>
+    </message>
+</context>
+<context>
+    <name>BelarusianTranslit</name>
+    <message>
+        <location filename="../belarusiantranslit.cc" line="417"/>
+        <source>Belarusian transliteration from latin to cyrillic (classic orthography)</source>
+        <translation type="unfinished">Белоруска транслитерација од латиница на кирилица (класичен правопис)</translation>
+    </message>
+    <message>
+        <location filename="../belarusiantranslit.cc" line="420"/>
+        <source>Belarusian transliteration from latin to cyrillic (school orthography)</source>
+        <translation>Белоруска транслитерација са латинице на ћирилицу (школски правопис)</translation>
+    </message>
+    <message>
+        <location filename="../belarusiantranslit.cc" line="423"/>
+        <source>Belarusian transliteration (smoothes out the difference
+between classic and school orthography in cyrillic)</source>
+        <translation>Белоруска транслитерација (изједначава разлике
+између класичних и школског правописа на ћирилици)</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Лозинка:</translation>
+    </message>
+</context>
+<context>
+    <name>DictGroupWidget</name>
+    <message>
+        <location filename="../dictgroupwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../dictgroupwidget.ui" line="37"/>
+        <source>Group icon:</source>
+        <translation type="unfinished">Икона на група:</translation>
+    </message>
+    <message>
+        <location filename="../dictgroupwidget.ui" line="85"/>
+        <source>Shortcut:</source>
+        <translation type="unfinished">Брз пристап:</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="38"/>
+        <source>None</source>
+        <translation type="unfinished">Ништо</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="43"/>
+        <source>From file...</source>
+        <translation type="unfinished">Од датотека...</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="90"/>
+        <source>Choose a file to use as group icon</source>
+        <translation type="unfinished">Одберете датотека за користење како икона на група</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="92"/>
+        <source>Images</source>
+        <translation type="unfinished">Слики</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="93"/>
+        <source>All files</source>
+        <translation type="unfinished">Сите датотеки</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="100"/>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="100"/>
+        <source>Can&apos;t read the specified image file.</source>
+        <translation type="unfinished">Не може да се чита одабраната слика</translation>
+    </message>
+</context>
+<context>
+    <name>DictGroupsWidget</name>
+    <message>
+        <location filename="../groups_widgets.cc" line="590"/>
+        <location filename="../groups_widgets.cc" line="665"/>
+        <location filename="../groups_widgets.cc" line="838"/>
+        <location filename="../groups_widgets.cc" line="1013"/>
+        <source>Dictionaries: </source>
+        <translation>Речници:</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="690"/>
+        <source>Confirmation</source>
+        <translation>Потврда</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="691"/>
+        <source>Are you sure you want to generate a set of groups based on language pairs?</source>
+        <translation type="unfinished">Да ли сте сигурни дека сакате да креирате сет на групи на основа на јазични парови?</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="716"/>
+        <source>Unassigned</source>
+        <translation type="unfinished">Недоделено</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="854"/>
+        <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
+        <translation type="unfinished">Комбинирајте групи од изворниот јазик во &quot;%1-&gt;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="871"/>
+        <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
+        <translation type="unfinished">Комбинирајте групи од целниот јазик во &quot;-&gt;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="889"/>
+        <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
+        <translation type="unfinished">Направете двострана група за преведување &quot;%1-%2-%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="907"/>
+        <location filename="../groups_widgets.cc" line="926"/>
+        <source>Combine groups with &quot;%1&quot;</source>
+        <translation type="unfinished">Комбинирајте група со &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Текстуални датотеки (*.txt);;Сите датотеки (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Откажи</translation>
+    </message>
+</context>
+<context>
+    <name>DictInfo</name>
+    <message>
+        <location filename="../dictinfo.ui" line="29"/>
+        <source>Total articles:</source>
+        <translation type="unfinished">Вкупно статии:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="46"/>
+        <source>Translates from:</source>
+        <translation type="unfinished">Изворен јазик:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="60"/>
+        <source>Total words:</source>
+        <translation type="unfinished">Вкупно зборови:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="77"/>
+        <source>Translates to:</source>
+        <translation type="unfinished">Преведи на:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="91"/>
+        <source>Open folder</source>
+        <translation type="unfinished">Отвори папка</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="110"/>
+        <source>Edit dictionary</source>
+        <translation>Уреди речник</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="120"/>
+        <source>Files comprising this dictionary:</source>
+        <translation type="unfinished">Датотеки кои го сочинуваат речникот:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="201"/>
+        <source>Description:</source>
+        <translation>Опис:</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.cc" line="29"/>
+        <source>Edit the dictionary via command:
+%1</source>
+        <translation type="unfinished">Уредиго  речникот преку команда:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>DictListModel</name>
+    <message>
+        <location filename="../groups_widgets.cc" line="233"/>
+        <source>%1 entries</source>
+        <translation type="unfinished">%1 влезови</translation>
+    </message>
+</context>
+<context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Икона</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictionaryBar</name>
+    <message>
+        <source>Dictionary Bar</source>
+        <translation type="obsolete">Картица речника</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="15"/>
+        <source>&amp;Dictionary Bar</source>
+        <translation type="unfinished">&amp;Лента на речникот</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="25"/>
+        <source>Extended menu with all dictionaries...</source>
+        <translation type="unfinished">Проширено мени со сите речници...</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="112"/>
+        <source>Edit this group</source>
+        <translation type="unfinished">Уреди ја оваа група</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="136"/>
+        <source>Dictionary info</source>
+        <translation type="unfinished">Податоци за речникот</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
+        <source>Open dictionary folder</source>
+        <translation type="unfinished">Отвори папка на речникот</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="150"/>
+        <source>Edit dictionary</source>
+        <translation>Уреди речник</translation>
+    </message>
+</context>
+<context>
+    <name>EditDictionaries</name>
+    <message>
+        <location filename="../editdictionaries.cc" line="44"/>
+        <source>&amp;Sources</source>
+        <translation>&amp;Извори</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
+        <source>&amp;Dictionaries</source>
+        <translation>&amp;Речници</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
+        <source>&amp;Groups</source>
+        <translation type="unfinished">&amp;Групи</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="122"/>
+        <source>Sources changed</source>
+        <translation type="unfinished">Извори сменети</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="123"/>
+        <source>Some sources were changed. Would you like to accept the changes?</source>
+        <translation type="unfinished">Некои извори се изменети. Прифаќаш измени?</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="126"/>
+        <source>Accept</source>
+        <translation type="unfinished">Прифати</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.cc" line="128"/>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <location filename="../editdictionaries.ui" line="14"/>
+        <source>Dictionaries</source>
+        <translation>Речници</translation>
+    </message>
+</context>
+<context>
+    <name>ExternalViewer</name>
+    <message>
+        <location filename="../externalviewer.cc" line="54"/>
+        <source>the viewer program name is empty</source>
+        <translation type="unfinished">Надворешен прикажувач - непознат</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Forvo::ForvoArticleRequest</name>
+    <message>
+        <location filename="../forvo.cc" line="224"/>
+        <source>XML parse error: %1 at %2,%3</source>
+        <translation>Анализа грешке XML: %1 на линији %2, колона %3</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="300"/>
+        <source>Added %1</source>
+        <translation>Додато %1</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="303"/>
+        <source>by</source>
+        <translation>из</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="307"/>
+        <source>Male</source>
+        <translation>Човек</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="307"/>
+        <source>Female</source>
+        <translation>Жена</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="309"/>
+        <source>from</source>
+        <translation>из</translation>
+    </message>
+    <message>
+        <location filename="../forvo.cc" line="347"/>
+        <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
+        <translation>Иди на Уреди|Речници|Извори|Forvo и примени на ваш кључ API, да бисте решили овај проблем.</translation>
+    </message>
+</context>
+<context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Откажи</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GermanTranslit</name>
+    <message>
+        <location filename="../german.cc" line="48"/>
+        <source>German Transliteration</source>
+        <translation type="unfinished">Транскрипција (Германски)</translation>
+    </message>
+</context>
+<context>
+    <name>GreekTranslit</name>
+    <message>
+        <location filename="../greektranslit.cc" line="839"/>
+        <source>Greek Transliteration</source>
+        <translation>Транскрипција (Грчки)</translation>
+    </message>
+</context>
+<context>
+    <name>GroupComboBox</name>
+    <message>
+        <location filename="../groupcombobox.cc" line="14"/>
+        <source>Choose a Group (Alt+G)</source>
+        <translation type="unfinished">Одберете група (Alt+G)</translation>
+    </message>
+</context>
+<context>
+    <name>GroupSelectorWidget</name>
+    <message>
+        <location filename="../groupselectorwidget.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Форма</translation>
+    </message>
+    <message>
+        <location filename="../groupselectorwidget.ui" line="19"/>
+        <source>Look in</source>
+        <translation type="unfinished">Побарај</translation>
+    </message>
+</context>
+<context>
+    <name>Groups</name>
+    <message>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
+        <source>Add group</source>
+        <translation type="unfinished">Додади група</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="124"/>
+        <source>Give a name for the new group:</source>
+        <translation type="unfinished">Внеси име на нова група:</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="149"/>
+        <source>Rename group</source>
+        <translation type="unfinished">Промени име на група</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="150"/>
+        <source>Give a new name for the group:</source>
+        <translation type="unfinished">Внесете ново име на група:</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="161"/>
+        <source>Remove group</source>
+        <translation type="unfinished">Отстрани  група</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="162"/>
+        <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation type="unfinished">Сигурно сакате да отстраните група &lt;b&gt;%1&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="186"/>
+        <location filename="../groups.cc" line="174"/>
+        <source>Remove all groups</source>
+        <translation type="unfinished">Отрстраните ги сите групи</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="175"/>
+        <source>Are you sure you want to remove all the groups?</source>
+        <translation type="unfinished">Сигурни сте да се отстранат сите групи?</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="22"/>
+        <source>Dictionaries available:</source>
+        <translation type="unfinished">Достапни речници:</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="64"/>
+        <source>Add selected dictionaries to group (Ins)</source>
+        <translation type="unfinished">Додај го одбраните речници во група (Ins)</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="67"/>
+        <source>&gt;</source>
+        <translation>&gt;</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="70"/>
+        <source>Ins</source>
+        <translation>Ins</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="89"/>
+        <source>Remove selected dictionaries from group (Del)</source>
+        <translation type="unfinished">Отстраните ги одбраните речници од група (Del)</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="92"/>
+        <source>&lt;</source>
+        <translation>&lt;</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="95"/>
+        <source>Del</source>
+        <translation>Del</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="119"/>
+        <source>Groups:</source>
+        <translation type="unfinished">Групи:</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="133"/>
+        <source>Tab 2</source>
+        <translation>Tab 2</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="143"/>
+        <source>Create new dictionary group</source>
+        <translation type="unfinished">Направи нова групу</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="146"/>
+        <source>&amp;Add group</source>
+        <translation type="unfinished">&amp;Додади група</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="153"/>
+        <source>Create language-based groups</source>
+        <translation type="unfinished">Направи групи на основа на јазични парови</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="156"/>
+        <source>Auto groups</source>
+        <translation type="unfinished">Ауто групи</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="163"/>
+        <source>Rename current dictionary group</source>
+        <translation type="unfinished">Преименувај ја тековната група на речникот</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="166"/>
+        <source>Re&amp;name group</source>
+        <translation type="unfinished">&amp;Преименувај група</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="173"/>
+        <source>Remove current dictionary group</source>
+        <translation type="unfinished">Отстрани тековна група речници</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="176"/>
+        <source>&amp;Remove group</source>
+        <translation type="unfinished">&amp;Отстраните група</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="183"/>
+        <source>Remove all dictionary groups</source>
+        <translation type="unfinished">Отстраните го сите групи речници</translation>
+    </message>
+    <message>
+        <location filename="../groups.ui" line="197"/>
+        <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
+        <translation type="unfinished">Повлечи па Спушти од/во групите , премести ги внатре во групите, промените го редоследот на групите, со помош на глушецот.</translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Напред</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Зумирај</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Одзумирај</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Вообичаена големина</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HistoryPaneWidget</name>
+    <message>
+        <location filename="../historypanewidget.cc" line="21"/>
+        <source>&amp;Delete Selected</source>
+        <translation type="unfinished">Избриши го одбраното</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="30"/>
+        <source>Copy Selected</source>
+        <translation type="unfinished">Копирај ги одбраните</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="47"/>
+        <source>History:</source>
+        <translation type="unfinished">Историја:</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="219"/>
+        <source>%1/%2</source>
+        <translation>%1/%2</translation>
+    </message>
+    <message>
+        <location filename="../historypanewidget.cc" line="223"/>
+        <source>History size: %1 entries out of maximum %2</source>
+        <translation type="unfinished">Големина на историјата: %1 внос од максимални %2</translation>
+    </message>
+</context>
+<context>
+    <name>Hunspell</name>
+    <message>
+        <location filename="../hunspell.cc" line="277"/>
+        <source>Spelling suggestions: </source>
+        <translation type="unfinished">Предлози за правопис: </translation>
+    </message>
+    <message>
+        <location filename="../hunspell.cc" line="868"/>
+        <source>%1 Morphology</source>
+        <translation>%1 (морфологија)</translation>
+    </message>
+</context>
+<context>
+    <name>HunspellDictsModel</name>
+    <message>
+        <location filename="../sources.cc" line="1340"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Вклучено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1342"/>
+        <source>Name</source>
+        <translation type="unfinished">Име</translation>
+    </message>
+</context>
+<context>
+    <name>Initializing</name>
+    <message>
+        <location filename="../initializing.cc" line="21"/>
+        <source>Please wait...</source>
+        <translation type="unfinished">Почекајте...</translation>
+    </message>
+    <message>
+        <location filename="../initializing.ui" line="28"/>
+        <location filename="../initializing.cc" line="30"/>
+        <source>Please wait while indexing dictionary</source>
+        <translation type="unfinished">Почекајте додека речникот се индексира </translation>
+    </message>
+    <message>
+        <location filename="../initializing.ui" line="22"/>
+        <source>GoldenDict - Initializing</source>
+        <translation type="unfinished">Стартувај го GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../initializing.ui" line="44"/>
+        <source>Dictionary Name</source>
+        <translation type="unfinished">Име на речникот</translation>
+    </message>
+</context>
+<context>
+    <name>Language</name>
+    <message>
+        <location filename="../language.cc" line="55"/>
+        <source>Afar</source>
+        <translation>Афарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="56"/>
+        <source>Abkhazian</source>
+        <translation>Абхазија</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="57"/>
+        <source>Avestan</source>
+        <translation>Авестан</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="58"/>
+        <source>Afrikaans</source>
+        <translation>Афрички</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="59"/>
+        <source>Akan</source>
+        <translation>Акански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="60"/>
+        <source>Amharic</source>
+        <translation>Амхарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="61"/>
+        <source>Aragonese</source>
+        <translation>Арагонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="62"/>
+        <source>Arabic</source>
+        <translation>Арапски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="63"/>
+        <source>Assamese</source>
+        <translation>Асамски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="64"/>
+        <source>Avaric</source>
+        <translation>Аварски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="65"/>
+        <source>Aymara</source>
+        <translation>Аимаран</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="66"/>
+        <source>Azerbaijani</source>
+        <translation>Азербејџански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="67"/>
+        <source>Bashkir</source>
+        <translation>Башкирски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="68"/>
+        <source>Belarusian</source>
+        <translation>Белоруски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="69"/>
+        <source>Bulgarian</source>
+        <translation>Бугарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="70"/>
+        <source>Bihari</source>
+        <translation>Бихарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="71"/>
+        <source>Bislama</source>
+        <translation>Бислама</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="72"/>
+        <source>Bambara</source>
+        <translation>Бамана</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="73"/>
+        <source>Bengali</source>
+        <translation>Бенгалски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="74"/>
+        <source>Tibetan</source>
+        <translation>Тибетански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="75"/>
+        <source>Breton</source>
+        <translation>Бретонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="76"/>
+        <source>Bosnian</source>
+        <translation type="unfinished">Босански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="77"/>
+        <source>Catalan</source>
+        <translation>Каталонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="78"/>
+        <source>Chechen</source>
+        <translation>Чеченски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="79"/>
+        <source>Chamorro</source>
+        <translation>Чаморо</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="80"/>
+        <source>Corsican</source>
+        <translation>Корсикански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="81"/>
+        <source>Cree</source>
+        <translation>Кри</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="82"/>
+        <source>Czech</source>
+        <translation>Чешки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="83"/>
+        <source>Church Slavic</source>
+        <translation>Црквено-словенски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="84"/>
+        <source>Chuvash</source>
+        <translation>Чувашски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="85"/>
+        <source>Welsh</source>
+        <translation>Велшки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="86"/>
+        <source>Danish</source>
+        <translation type="unfinished">Дански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="87"/>
+        <source>German</source>
+        <translation type="unfinished">Германски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="88"/>
+        <source>Divehi</source>
+        <translation>Малдиви</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="89"/>
+        <source>Dzongkha</source>
+        <translation>Џонга (Бутан)</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="90"/>
+        <source>Ewe</source>
+        <translation>Еве</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="91"/>
+        <source>Greek</source>
+        <translation>Грчки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="92"/>
+        <source>English</source>
+        <translation type="unfinished">Англиски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="93"/>
+        <source>Esperanto</source>
+        <translation>Есперанто</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="94"/>
+        <source>Spanish</source>
+        <translation>Шпански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="95"/>
+        <source>Estonian</source>
+        <translation>Естонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="96"/>
+        <source>Basque</source>
+        <translation>Баскијски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="97"/>
+        <source>Persian</source>
+        <translation>Персијски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="98"/>
+        <source>Fulah</source>
+        <translation>Фула</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="99"/>
+        <source>Finnish</source>
+        <translation>Фински</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="100"/>
+        <source>Fijian</source>
+        <translation>Фиџи</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="101"/>
+        <source>Faroese</source>
+        <translation>Фарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="102"/>
+        <source>French</source>
+        <translation>Француски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="103"/>
+        <source>Western Frisian</source>
+        <translation>Фризииски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="104"/>
+        <source>Irish</source>
+        <translation>Галски (Ирска)</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="105"/>
+        <source>Scottish Gaelic</source>
+        <translation>Галски (Шкотска)</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="106"/>
+        <source>Galician</source>
+        <translation>Галицијски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="107"/>
+        <source>Guarani</source>
+        <translation>Гварани</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="108"/>
+        <source>Gujarati</source>
+        <translation>Гуџарати</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="109"/>
+        <source>Manx</source>
+        <translation>Манкс</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="110"/>
+        <source>Hausa</source>
+        <translation>Хауса</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="111"/>
+        <source>Hebrew</source>
+        <translation>Јеврејски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="112"/>
+        <source>Hindi</source>
+        <translation>Хинди</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="113"/>
+        <source>Hiri Motu</source>
+        <translation>Хири-моту</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="114"/>
+        <source>Croatian</source>
+        <translation>Хрватски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="115"/>
+        <source>Haitian</source>
+        <translation>Хаићански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="116"/>
+        <source>Hungarian</source>
+        <translation>Мађарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="117"/>
+        <source>Armenian</source>
+        <translation>Јерменски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="118"/>
+        <source>Herero</source>
+        <translation>Ереро</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="119"/>
+        <source>Interlingua</source>
+        <translation>Интерлингва</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="120"/>
+        <source>Indonesian</source>
+        <translation>Индонезијски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="121"/>
+        <source>Interlingue</source>
+        <translation>Интерлингве</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="122"/>
+        <source>Igbo</source>
+        <translation>Ибо</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="123"/>
+        <source>Sichuan Yi</source>
+        <translation>Сечуан И</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="124"/>
+        <source>Inupiaq</source>
+        <translation>Инупиак</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="125"/>
+        <source>Ido</source>
+        <translation>Идо</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="126"/>
+        <source>Icelandic</source>
+        <translation>Исландски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="127"/>
+        <source>Italian</source>
+        <translation>Италијански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="128"/>
+        <source>Inuktitut</source>
+        <translation>Инуктитут</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="129"/>
+        <source>Japanese</source>
+        <translation>Јапански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="130"/>
+        <source>Javanese</source>
+        <translation>Јаванац</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="131"/>
+        <source>Georgian</source>
+        <translation>Грузијски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="132"/>
+        <source>Kongo</source>
+        <translation>Конго</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="133"/>
+        <source>Kikuyu</source>
+        <translation>Кикују</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="134"/>
+        <source>Kwanyama</source>
+        <translation>Кваниама</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="135"/>
+        <source>Kazakh</source>
+        <translation>Казак</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="136"/>
+        <source>Kalaallisut</source>
+        <translation>Калаалисут</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="137"/>
+        <source>Khmer</source>
+        <translation>Кмерски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="138"/>
+        <source>Kannada</source>
+        <translation>Канада</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="139"/>
+        <source>Korean</source>
+        <translation>Корејски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="140"/>
+        <source>Kanuri</source>
+        <translation>Канури</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="141"/>
+        <source>Kashmiri</source>
+        <translation>Кашмирски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="142"/>
+        <source>Kurdish</source>
+        <translation>Курдски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="143"/>
+        <source>Komi</source>
+        <translation>Коми</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="144"/>
+        <source>Cornish</source>
+        <translation>Корнвалски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="145"/>
+        <source>Kirghiz</source>
+        <translation>Киргизски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="146"/>
+        <source>Latin</source>
+        <translation>Латински</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="147"/>
+        <source>Luxembourgish</source>
+        <translation>Луксембургшки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="148"/>
+        <source>Ganda</source>
+        <translation>Ганда</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="149"/>
+        <source>Limburgish</source>
+        <translation>Лимбурзхски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="150"/>
+        <source>Lingala</source>
+        <translation>Лингала</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="151"/>
+        <source>Lao</source>
+        <translation>Лао</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="152"/>
+        <source>Lithuanian</source>
+        <translation>Литвански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="153"/>
+        <source>Luba-Katanga</source>
+        <translation>Луба-Катанга</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="154"/>
+        <source>Latvian</source>
+        <translation>Летонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="155"/>
+        <source>Malagasy</source>
+        <translation>Мадагаскарац</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="156"/>
+        <source>Marshallese</source>
+        <translation>Маршалски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="157"/>
+        <source>Maori</source>
+        <translation>Маори</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="158"/>
+        <source>Macedonian</source>
+        <translation>Македонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="159"/>
+        <source>Malayalam</source>
+        <translation>Малаиалам</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="160"/>
+        <source>Mongolian</source>
+        <translation>Монголски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="161"/>
+        <source>Marathi</source>
+        <translation>Марати</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="162"/>
+        <source>Malay</source>
+        <translation>Малајски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="163"/>
+        <source>Maltese</source>
+        <translation>Малтешки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="164"/>
+        <source>Burmese</source>
+        <translation>Бурмански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="165"/>
+        <source>Nauru</source>
+        <translation>Науру</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="166"/>
+        <source>Norwegian Bokmal</source>
+        <translation>Норвешки букмол</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="167"/>
+        <source>North Ndebele</source>
+        <translation>Сев. Ндебеле</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="168"/>
+        <source>Nepali</source>
+        <translation>Непалски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="169"/>
+        <source>Ndonga</source>
+        <translation>Ндонга</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="170"/>
+        <source>Dutch</source>
+        <translation>Холандски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="171"/>
+        <source>Norwegian Nynorsk</source>
+        <translation>Норвешки (нинорск)</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="172"/>
+        <source>Norwegian</source>
+        <translation>Норвешки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="173"/>
+        <source>South Ndebele</source>
+        <translation>Јуж. Ндебеле</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="174"/>
+        <source>Navajo</source>
+        <translation>Навахо</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="175"/>
+        <source>Chichewa</source>
+        <translation>Чичева</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="176"/>
+        <source>Occitan</source>
+        <translation>Французски (диалект Occitan)</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="177"/>
+        <source>Ojibwa</source>
+        <translation>Оджибва</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="178"/>
+        <source>Oromo</source>
+        <translation>Оромо</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="179"/>
+        <source>Oriya</source>
+        <translation>Орија</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="180"/>
+        <source>Ossetian</source>
+        <translation>Осетински</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="181"/>
+        <source>Panjabi</source>
+        <translation>Панџаби</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="182"/>
+        <source>Pali</source>
+        <translation>Пали</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="183"/>
+        <source>Polish</source>
+        <translation>Пољски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="184"/>
+        <source>Pashto</source>
+        <translation>Пуштунски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="185"/>
+        <source>Portuguese</source>
+        <translation>Португалски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="186"/>
+        <source>Quechua</source>
+        <translation>Кечуа</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="187"/>
+        <source>Raeto-Romance</source>
+        <translation>Романшски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="188"/>
+        <source>Kirundi</source>
+        <translation>Кирунди</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="189"/>
+        <source>Romanian</source>
+        <translation>Румынски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="190"/>
+        <source>Russian</source>
+        <translation>Руски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="191"/>
+        <source>Kinyarwanda</source>
+        <translation>Кињаруанда</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="192"/>
+        <source>Sanskrit</source>
+        <translation>Санскрит</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="193"/>
+        <source>Sardinian</source>
+        <translation>Сардинијски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="194"/>
+        <source>Sindhi</source>
+        <translation>Синдхи</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="195"/>
+        <source>Northern Sami</source>
+        <translation>Северна Сами</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="196"/>
+        <source>Sango</source>
+        <translation>Санго</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="197"/>
+        <source>Serbo-Croatian</source>
+        <translation>Српско-Хрватски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="198"/>
+        <source>Sinhala</source>
+        <translation>Синхала</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="199"/>
+        <source>Slovak</source>
+        <translation>Словачки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="200"/>
+        <source>Slovenian</source>
+        <translation>Словеначки</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="201"/>
+        <source>Samoan</source>
+        <translation>Самоа</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="202"/>
+        <source>Shona</source>
+        <translation>Схона</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="203"/>
+        <source>Somali</source>
+        <translation>Сомалиски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="204"/>
+        <source>Albanian</source>
+        <translation>Албански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="205"/>
+        <source>Serbian</source>
+        <translation>Српски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="206"/>
+        <source>Swati</source>
+        <translation>Свати</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="207"/>
+        <source>Southern Sotho</source>
+        <translation>Јуж. Сото</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="208"/>
+        <source>Sundanese</source>
+        <translation>Судански</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="209"/>
+        <source>Swedish</source>
+        <translation>Шведски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="210"/>
+        <source>Swahili</source>
+        <translation>Суахили</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="211"/>
+        <source>Tamil</source>
+        <translation>Тамилски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="212"/>
+        <source>Telugu</source>
+        <translation>Телугу</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="213"/>
+        <source>Tajik</source>
+        <translation>Таџикски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="214"/>
+        <source>Thai</source>
+        <translation>Тајландски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="215"/>
+        <source>Tigrinya</source>
+        <translation>Тигриња</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="216"/>
+        <source>Turkmen</source>
+        <translation>Туркменски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="217"/>
+        <source>Tagalog</source>
+        <translation>Тагалог</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="218"/>
+        <source>Tswana</source>
+        <translation>Тсвана</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="219"/>
+        <source>Tonga</source>
+        <translation>Тонга</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="220"/>
+        <source>Turkish</source>
+        <translation>Турски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="221"/>
+        <source>Tsonga</source>
+        <translation>Тсонга</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="222"/>
+        <source>Tatar</source>
+        <translation>Татарски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="223"/>
+        <source>Twi</source>
+        <translation>Тви</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="224"/>
+        <source>Tahitian</source>
+        <translation>Тахитиан</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="225"/>
+        <source>Uighur</source>
+        <translation>Ујгурски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="226"/>
+        <source>Ukrainian</source>
+        <translation>Украјински</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="227"/>
+        <source>Urdu</source>
+        <translation>Урду</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="228"/>
+        <source>Uzbek</source>
+        <translation>Узбекски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="229"/>
+        <source>Venda</source>
+        <translation>Венда</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="230"/>
+        <source>Vietnamese</source>
+        <translation>Вијетнамски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="231"/>
+        <source>Volapuk</source>
+        <translation>Волапук</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="232"/>
+        <source>Walloon</source>
+        <translation>Валонски</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="233"/>
+        <source>Wolof</source>
+        <translation>Волоф</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="234"/>
+        <source>Xhosa</source>
+        <translation>Кхоса</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="235"/>
+        <source>Yiddish</source>
+        <translation>Јидиш</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="236"/>
+        <source>Yoruba</source>
+        <translation>Јоруба</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="237"/>
+        <source>Zhuang</source>
+        <translation>Чжуанг</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="238"/>
+        <source>Chinese</source>
+        <translation>Кинески</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="239"/>
+        <source>Zulu</source>
+        <translation>Зулу</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="240"/>
+        <source>Lojban</source>
+        <translation>Lojban</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="375"/>
+        <source>Traditional Chinese</source>
+        <translation>Традиционални кинески</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="376"/>
+        <source>Simplified Chinese</source>
+        <translation>Поједностављени кинески</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="377"/>
+        <source>Other</source>
+        <translation>Остали</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="378"/>
+        <source>Other Simplified Chinese dialects</source>
+        <translation>Остали поједностављеном кинеском дијалекти</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="379"/>
+        <source>Other Traditional Chinese dialects</source>
+        <translation>Остали традиционални кинески дијалекти</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="380"/>
+        <source>Other Eastern-European languages</source>
+        <translation>Остали источно-европски језици</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="381"/>
+        <source>Other Western-European languages</source>
+        <translation>Остали западно-европски језици</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="382"/>
+        <source>Other Russian languages</source>
+        <translation>Остали руски језици</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="383"/>
+        <source>Other Japanese languages</source>
+        <translation>Остали јапански језици</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="384"/>
+        <source>Other Baltic languages</source>
+        <translation>Остали балтички језици</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="385"/>
+        <source>Other Greek languages</source>
+        <translation>Остали грчки језици</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="386"/>
+        <source>Other Korean dialects</source>
+        <translation>Остали корејски дијалекти</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="387"/>
+        <source>Other Turkish dialects</source>
+        <translation>Остали турски дијалекти</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="388"/>
+        <source>Other Thai dialects</source>
+        <translation>Остали тајландски дијалекти</translation>
+    </message>
+    <message>
+        <location filename="../language.cc" line="389"/>
+        <source>Tamazight</source>
+        <translation>Tamazight</translation>
+    </message>
+</context>
+<context>
+    <name>LoadDictionaries</name>
+    <message>
+        <location filename="../loaddictionaries.cc" line="266"/>
+        <source>Error loading dictionaries</source>
+        <translation type="unfinished">Грешка при вчитување на статијата</translation>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <location filename="../main.cc" line="214"/>
+        <source>Error in configuration file. Continue with default settings?</source>
+        <translation type="unfinished">Грешка во поставката на датотеката. Да продолжиме со претпоставени нагодувања?</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Navigation</source>
+        <translation type="obsolete">Навигација</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="154"/>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="156"/>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="181"/>
+        <source>Scan Popup</source>
+        <translation type="unfinished">Скан Попап</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="343"/>
+        <source>Show &amp;Main Window</source>
+        <translation type="unfinished">Прикажи &amp;главен прозорец</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">И&amp;злез</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="548"/>
+        <source>Loading...</source>
+        <translation type="unfinished">Вчитување...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2925"/>
+        <source>Skip This Release</source>
+        <translation type="unfinished">Прескокни ја оваа верзија</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
+        <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
+        <translation type="unfinished">Го сокривте главното мени. За да го вратите, користете %1.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3056"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3154"/>
+        <source>Page Setup</source>
+        <translation type="unfinished">Дотерување/Нагодување на страна</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3155"/>
+        <source>No printer is available. Please install one first.</source>
+        <translation type="unfinished">Нема достапен печатач. Ве молиме, прво инсталирајте го.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3173"/>
+        <source>Print Article</source>
+        <translation type="unfinished">Печати статија</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3242"/>
+        <source>Article, Complete (*.html)</source>
+        <translation type="unfinished">Статија, целосна (*.html)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3243"/>
+        <source>Article, HTML Only (*.html)</source>
+        <translation type="unfinished">Статија, само HTML (*.html)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3246"/>
+        <source>Save Article As</source>
+        <translation type="unfinished">Сочувај ја оваа статија како</translation>
+    </message>
+    <message>
+        <source>Html files (*.html *.htm)</source>
+        <translation type="obsolete">Датотека Html (*.html *.htm)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3260"/>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3261"/>
+        <source>Can&apos;t save article: %1</source>
+        <translation type="unfinished">Не е возможно да се сочува статијата: %1</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1213"/>
+        <source>%1 dictionaries, %2 articles, %3 words</source>
+        <translation type="unfinished">Речник: %1, статии: %2, зборови: %3</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2781"/>
+        <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
+        <translation type="unfinished">Неуспешна иницијализација на механизмот за надгледување на кратенките(на таст.).&lt;br&gt;Проверете дали вашиот XServer подржува RECORD EXtension.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2918"/>
+        <source>New Release Available</source>
+        <translation type="unfinished">Достапна е нова верзија</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2919"/>
+        <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
+        <translation type="unfinished">Издание &lt;b&gt;%1&lt;/b&gt; на програмот GoldenDict е достапно за преземање.&lt;br&gt;
+Притисни &lt;b&gt;Преземи&lt;/b&gt;, за премин на  страна за преземање.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2924"/>
+        <source>Download</source>
+        <translation type="unfinished">Преземање</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
+        <source>Look up in:</source>
+        <translation type="unfinished">Побарај во:</translation>
+    </message>
+    <message>
+        <source>Show Names in Dictionary Bar</source>
+        <translation type="obsolete">Прикажи име у картици речника</translation>
+    </message>
+    <message>
+        <source>Show Small Icons in Toolbars</source>
+        <translation type="obsolete">Прикажи мале иконе на траци са алаткама</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="96"/>
+        <source>&amp;Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="299"/>
+        <source>Found in Dictionaries:</source>
+        <translation type="unfinished">Најдено во речниците:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="196"/>
+        <source>Pronounce Word (Alt+S)</source>
+        <translation type="unfinished">Изговори збор (Alt+S)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="94"/>
+        <source>Show Names in Dictionary &amp;Bar</source>
+        <translation type="unfinished">Прикажи називи во картичките &amp;Лентата на речникот</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="95"/>
+        <source>Show Small Icons in &amp;Toolbars</source>
+        <translation type="unfinished">Прикажи мала икона во &amp;алатникот</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="151"/>
+        <source>&amp;Navigation</source>
+        <translation>&amp;Навигација</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="208"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Зумирај</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="214"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Одзумирај</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="218"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Вообичаена големина</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="329"/>
+        <source>Words Zoom In</source>
+        <translation type="unfinished">Зборови Зумирај</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="333"/>
+        <source>Words Zoom Out</source>
+        <translation type="unfinished">Зборови Одзумирај</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="335"/>
+        <source>Words Normal Size</source>
+        <translation type="unfinished">Вообичаена големина на букви</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="381"/>
+        <source>Close current tab</source>
+        <translation type="unfinished">Затвори ја тековната картичка</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="391"/>
+        <source>Close all tabs</source>
+        <translation type="unfinished">Затвори ги сите картички</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="399"/>
+        <source>Close all tabs except current</source>
+        <translation type="unfinished">Затворите ги сите картички освен тековната</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
+        <source>Accessibility API is not enabled</source>
+        <translation type="unfinished">Достапност API не е овозможен</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1224"/>
+        <source>Look up:</source>
+        <translation type="unfinished">Побарај:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1242"/>
+        <source>All</source>
+        <translation type="unfinished">Се</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3298"/>
+        <source>Saving article...</source>
+        <translation type="unfinished">Меморирање статија...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3358"/>
+        <source>The main window is set to be always on top.</source>
+        <translation type="unfinished">Главнен прозорев е поставен секогаш да е најгоре.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3525"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished">&amp;Сокри</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3551"/>
+        <source>Export history to file</source>
+        <translation type="unfinished">Извоз на историја во датотека</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Текстуални датотеки (*.txt);;Сите датотеки (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3592"/>
+        <source>History export complete</source>
+        <translation type="unfinished">Извоз на историјата е завршен</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3595"/>
+        <source>Export error: </source>
+        <translation type="unfinished">Извоз грешка:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3613"/>
+        <source>Import history from file</source>
+        <translation type="unfinished">Увоз на историја од датотека</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3662"/>
+        <source>Import error: invalid data in file</source>
+        <translation type="unfinished">Увоз грешка: неважечки податоци во датотека</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3666"/>
+        <source>History import complete</source>
+        <translation type="unfinished">Увоз на историјата е завршен</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3669"/>
+        <source>Import error: </source>
+        <translation type="unfinished">Грешка при увоз:</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3920"/>
+        <source>Dictionary info</source>
+        <translation type="unfinished">Податоци за речникот</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
+        <source>Open dictionary folder</source>
+        <translation type="unfinished">Отвори папка на речник</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3932"/>
+        <source>Edit dictionary</source>
+        <translation>Уреди речник</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="370"/>
+        <source>Opened tabs</source>
+        <translation type="unfinished">Отворени картички</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
+        <source>Open Tabs List</source>
+        <translation type="unfinished">Отвори листа на картички</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1455"/>
+        <source>(untitled)</source>
+        <translation type="unfinished">(неименуван)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1669"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <source>WARNING: %1</source>
+        <translation type="obsolete">Пажња: %1</translation>
+    </message>
+    <message>
+        <source>GoldenDict</source>
+        <translation type="obsolete">GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="46"/>
+        <location filename="../mainwindow.cc" line="735"/>
+        <source>Welcome!</source>
+        <translation type="unfinished">Добро дојдовте!</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="78"/>
+        <source>&amp;File</source>
+        <translation>&amp;Датотека</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="95"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Уреди</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="102"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Помош</translation>
+    </message>
+    <message>
+        <source>&amp;Dictionaries...	F3</source>
+        <translation type="obsolete">&amp;Речници...	F3</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="353"/>
+        <source>&amp;Preferences...</source>
+        <translation type="unfinished">&amp;Поставки...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="429"/>
+        <source>F2</source>
+        <translation>F2</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="115"/>
+        <source>&amp;View</source>
+        <translation>&amp;Приказ</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="119"/>
+        <source>&amp;Zoom</source>
+        <translation type="unfinished">&amp;Зголеми</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="126"/>
+        <source>H&amp;istory</source>
+        <translation type="unfinished">&amp;Историја</translation>
+    </message>
+    <message>
+        <source>Results Navigation Pane</source>
+        <translation type="obsolete">Окно навигације за резуктате</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
+        <source>&amp;Search Pane</source>
+        <translation type="unfinished">&amp;Пребарај окно</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
+        <source>&amp;Results Navigation Pane</source>
+        <translation type="unfinished">&amp;Резултати окно за навигација</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="304"/>
+        <source>&amp;History Pane</source>
+        <translation type="unfinished">&amp;Окно историја</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="338"/>
+        <source>&amp;Dictionaries...</source>
+        <translation>&amp;Речници...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="341"/>
+        <source>F3</source>
+        <translation>F3</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="356"/>
+        <source>F4</source>
+        <translation>F4</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="364"/>
+        <source>&amp;Homepage</source>
+        <translation type="unfinished">&amp;Почетна страна</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="372"/>
+        <source>&amp;About</source>
+        <translation type="unfinished">&amp;За програмот</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="375"/>
+        <source>About GoldenDict</source>
+        <translation type="unfinished">За GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="386"/>
+        <source>Quit from application</source>
+        <translation type="unfinished">Затвори апликација</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="389"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="397"/>
+        <source>&amp;Forum</source>
+        <translation>&amp;Форум</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="405"/>
+        <source>&amp;Close To Tray</source>
+        <translation type="unfinished">&amp;Затвори во палета(треј)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="408"/>
+        <source>Minimizes the window to tray</source>
+        <translation type="unfinished">Смали прозорец во палета</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="411"/>
+        <source>Ctrl+F4</source>
+        <translation>Ctrl+F4</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="423"/>
+        <source>&amp;Save Article</source>
+        <translation type="unfinished">&amp;Сочувај статија</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="426"/>
+        <source>Save Article</source>
+        <translation type="unfinished">Сочувајте статија</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="441"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished">&amp;Печати</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="444"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="452"/>
+        <source>Page Set&amp;up</source>
+        <translation type="unfinished">П&amp;оставки на страна</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="460"/>
+        <source>Print Pre&amp;view</source>
+        <translation type="unfinished">Преглед пред п&amp;ечатење</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="468"/>
+        <source>&amp;Rescan Files</source>
+        <translation type="unfinished">&amp;Повторно сканирај датотеки</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="491"/>
+        <source>&amp;New Tab</source>
+        <translation type="unfinished">&amp;Нова картичка(таб)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
+        <source>&amp;Show</source>
+        <translation>&amp;Прикажи</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="516"/>
+        <source>Ctrl+H</source>
+        <translation>Ctrl+H</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="524"/>
+        <source>&amp;Export</source>
+        <translation>&amp;Извоз</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="532"/>
+        <source>&amp;Import</source>
+        <translation>&amp;Увоз</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="543"/>
+        <source>&amp;Always on Top</source>
+        <translation type="unfinished">&amp;Секога најгоре</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="546"/>
+        <source>Always on Top</source>
+        <translation type="unfinished">Секогаш најгоре</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="549"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
+        <source>Menu Button</source>
+        <translation type="unfinished">Копче на менито</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print Preview</source>
+        <translation type="obsolete">Преглед пре штампања</translation>
+    </message>
+    <message>
+        <source>Rescan Files</source>
+        <translation type="obsolete">Поново прегледа датотеке</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
+        <source>Ctrl+F5</source>
+        <translation>Ctrl+F5</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="479"/>
+        <source>&amp;Clear</source>
+        <translation>О&amp;чисти</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="558"/>
+        <source>New Tab</source>
+        <translation type="unfinished">Нова картичка</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="494"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="505"/>
+        <source>&amp;Configuration Folder</source>
+        <translation type="unfinished">Папка за нагодувања</translation>
+    </message>
+    <message>
+        <source>Search Pane</source>
+        <translation type="obsolete">Окно претраге</translation>
+    </message>
+</context>
+<context>
+    <name>Mdx::MdxArticleRequest</name>
+    <message>
+        <location filename="../mdx.cc" line="636"/>
+        <source>Dictionary file was tampered or corrupted</source>
+        <translation>Речник датотека је покварен или оштећен</translation>
+    </message>
+    <message>
+        <location filename="../mdx.cc" line="647"/>
+        <source>Failed loading article from %1, reason: %2</source>
+        <translation>Неуспешно учитавање чланка из %1, разлог: %2</translation>
+    </message>
+</context>
+<context>
+    <name>MediaWiki::MediaWikiArticleRequest</name>
+    <message>
+        <location filename="../mediawiki.cc" line="324"/>
+        <source>XML parse error: %1 at %2,%3</source>
+        <translation>Анализа грешке XML: %1 у %2, колони %3</translation>
+    </message>
+</context>
+<context>
+    <name>MediaWiki::MediaWikiWordSearchRequest</name>
+    <message>
+        <location filename="../mediawiki.cc" line="192"/>
+        <source>XML parse error: %1 at %2,%3</source>
+        <translation>Анализа грешке XML: %1 у %2, колони %3</translation>
+    </message>
+</context>
+<context>
+    <name>MediaWikisModel</name>
+    <message>
+        <location filename="../sources.cc" line="449"/>
+        <source>Enabled</source>
+        <translation>Укључено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="451"/>
+        <source>Name</source>
+        <translation>Назив</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="453"/>
+        <source>Address</source>
+        <translation>Адреса</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="455"/>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
+</context>
+<context>
+    <name>OrderAndProps</name>
+    <message>
+        <location filename="../orderandprops.ui" line="14"/>
+        <source>Form</source>
+        <translation>збор</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="37"/>
+        <source>Dictionary order:</source>
+        <translation>Редослед речника:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="53"/>
+        <source>Inactive (disabled) dictionaries:</source>
+        <translation>Неактиван (онемогућени) речници:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="67"/>
+        <source>Dictionary information</source>
+        <translation>Информације о речнику</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="75"/>
+        <source>Name:</source>
+        <translation>Назив:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="105"/>
+        <source>Total articles:</source>
+        <translation>Укупно чланака:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="112"/>
+        <source>Total words:</source>
+        <translation>Укупно речи:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="129"/>
+        <source>Translates from:</source>
+        <translation>Изворни језик:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="136"/>
+        <source>Translates to:</source>
+        <translation>Циљни језик:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="165"/>
+        <source>Description:</source>
+        <translation>Опис:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="245"/>
+        <source>Files comprising this dictionary:</source>
+        <translation>Датотеке које чине речник:</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.ui" line="325"/>
+        <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
+        <translation>Промена редоследа речника, превлачењем миша. Да бисте онемогућили речник превуците га на дно неактивне групе.</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="253"/>
+        <source>Sort by name</source>
+        <translation>Разврстај по имену</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="255"/>
+        <source>Sort by languages</source>
+        <translation>Разврстај по језицима</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PathsModel</name>
+    <message>
+        <location filename="../sources.cc" line="1122"/>
+        <source>Path</source>
+        <translation type="unfinished">Патека</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1124"/>
+        <source>Recursive</source>
+        <translation>Рекурзивно</translation>
+    </message>
+</context>
+<context>
+    <name>Preferences</name>
+    <message>
+        <location filename="../preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Поставки</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="47"/>
+        <source>&amp;Interface</source>
+        <translation type="unfinished">&amp;Интерфејс</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="187"/>
+        <source>Tabbed browsing</source>
+        <translation type="unfinished">Прегледување со помош на картички</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="193"/>
+        <source>Normally, opening a new tab switches to it immediately.
+With this on however, new tabs will be opened without
+switching to them.</source>
+        <translation type="unfinished">Обично када отворате нова картичка, преминете на неа
+веднаш. Меѓутоа, кога оваа опција е овозможена, новата картичка ќе се
+отвори, без нивно преминување.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="198"/>
+        <source>Open new tabs in background</source>
+        <translation type="unfinished">Отворање нова картичка во позадина</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="205"/>
+        <source>With this on, new tabs are opened just after the
+current, active one. Otherwise they are added to
+be the last ones.</source>
+        <translation type="unfinished">Ако оваа опција е омоможена, новата картичка ќе биде
+отворена веднаш по тековната, во спротивно
+се додава на крај.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="210"/>
+        <source>Open new tabs after the current one</source>
+        <translation type="unfinished">Отворање нова картичка по тековната</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="99"/>
+        <source>When enabled, an icon appears in the sytem tray area which can be used
+to open main window and perform other tasks.</source>
+        <translation type="unfinished">Кога е овозможено, икона се појавува во сист.палета која можеда се користи,
+да се отвори главен прозорец и да се извршат други задачи.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="103"/>
+        <source>Enable system tray icon</source>
+        <translation type="unfinished">Прикажи икона во системската палета</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="121"/>
+        <source>With this on, the application starts directly to system tray without showing
+its main window.</source>
+        <translation type="unfinished">Када е омозможена оваа опцију, апликацијата ќе работи во систем. палета
+без приказ на главниот прозорец.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="125"/>
+        <source>Start to system tray</source>
+        <translation type="unfinished">Стартувај во системската палета</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="132"/>
+        <source>With this on, an attempt to close main window would hide it instead of closing
+the application.</source>
+        <translation type="unfinished">Кога оваа опција е вклучена, обид за затварање на главниот прозорец само ќе го скрие
+во системската палета.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="136"/>
+        <source>Close to system tray</source>
+        <translation type="unfinished">Затвори во системска палета</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="53"/>
+        <source>Startup</source>
+        <translation type="unfinished">Стартување</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="62"/>
+        <source>Start with system</source>
+        <translation type="unfinished">Стартувај со системот</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="239"/>
+        <source>Interface language:</source>
+        <translation type="unfinished">Јазик на интерфејсот:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="265"/>
+        <source>Display style:</source>
+        <translation type="unfinished">Стил на Приказ:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="146"/>
+        <source>Double-click translates the word clicked</source>
+        <translation type="unfinished">Преведи го одбраниот збор со двоен клик</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="417"/>
+        <source>Chooses whether the scan popup mode is on by default or not. If checked,
+the program would always start with the scan popup active.</source>
+        <translation type="unfinished">Вклучи или не вклучи попап прозорец кога програмот стартува.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="616"/>
+        <source>Normally, in order to activate a popup you have to
+maintain the chosen keys pressed while you select
+a word. With this enabled, the chosen keys may also
+be pressed shortly after the selection is done.</source>
+        <translatorcomment>Можда је боље овако:
+Обично искакање прозора активира се само ако су изабрани
+тастери притиснути док бирате реч. Ако је ова опција укључена,
+одабрани тастери могу да се притисну и текст је истакнут.</translatorcomment>
+        <translation type="unfinished">Во нормална состојба, за да активирате &apos;попап&apos;
+прозорец, мора да го држите одбраниот тастер во процесот
+на истакнувањето на зборот. Међутоа, ако го користите овој режим, тастерот
+може да се притисне одредено време после
+тоа, како зборот би се издвоил.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="706"/>
+        <source>Hotkeys</source>
+        <translation type="unfinished">Макро команди</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="725"/>
+        <source>Use the following hotkey to show or hide the main window:</source>
+        <translation type="unfinished">Користете следен макро за прикажување/криење на главниот прозорец:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="756"/>
+        <source>Use the following hotkey to translate a word from clipboard:</source>
+        <translation type="unfinished">Користете следно макро за преведување зборови од остава:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="803"/>
+        <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
+        <translation type="unfinished">Макро Командите се глобални и работат за секој програм и сите контексти, се додека GoldenDict работи во позадина.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="380"/>
+        <source>&amp;Scan Popup</source>
+        <translation type="unfinished">&amp;Скан попап </translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="217"/>
+        <source>Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</source>
+        <translation type="unfinished">Овозможите ја оваа опција ако не сакате да гледате лента со картички 
+а само една картичка е отворена.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="220"/>
+        <source>Hide single tab</source>
+        <translation type="unfinished">Сокри сингл(една) картичка</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="59"/>
+        <source>Automatically starts GoldenDict after operation system bootup.</source>
+        <translation type="unfinished">Автоматски стартувај го GoldenDict при стартување на оперативниот систем.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="74"/>
+        <source>Add-on style:</source>
+        <translation type="unfinished">Додаток на стилот:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="153"/>
+        <source>Normally, pressing ESC key moves focus to the translation line.
+With this on however, it will hide the main window.</source>
+        <translation type="unfinished">Во нормален режим на работа, копчето ESC го поместува фокусот на линијта на преводот.
+Ако ја овозможите оваа опција, таа ќе го сокрие главниот прозорец.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="157"/>
+        <source>ESC key hides main window</source>
+        <translation type="unfinished">Сокриј го главниот прозорец со прит. ESC</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="164"/>
+        <source>Turn this option on if you want to select words by single mouse click</source>
+        <translation type="unfinished">Вклучете ја оваа можност ако сакате да одбирете зборови со еден клик на глушецот</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="167"/>
+        <source>Select word by single click</source>
+        <translation type="unfinished">Одберете збор со еден клик</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="227"/>
+        <source>Ctrl-Tab navigates tabs in MRU order</source>
+        <translation type="unfinished">Ctrl-Tab навигација на картичка во MRU редослед</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
+        <source>Adjust this value to avoid huge context menus.</source>
+        <translation type="unfinished">Дотерајте ја оваа вредност за да одбегнете огромни контекстни менија</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="337"/>
+        <source>Context menu dictionaries limit:</source>
+        <translation type="unfinished">Ограничи контекст мени на речници:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="399"/>
+        <source>When enabled, a translation popup window would be shown each time
+you point your mouse on any word on the screen (Windows) or select
+any word with mouse (Linux). When enabled, you can switch it on and
+off from main window or tray icon.</source>
+        <translation type="unfinished">Кога е овозможено, попап прозорец на преводот ће се прикаже секогаш 
+кога покажувате со глушецот на било кој збор на екранот(во Windows) или одберете 
+било кој збор со глушецот (во Linux). Кога е овозможено, можете да го вклучите и
+исклучите од главниот прозорец или иконичката.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="405"/>
+        <source>Enable scan popup functionality</source>
+        <translation type="unfinished">Овозможи попап функционалност</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="421"/>
+        <source>Start with scan popup turned on</source>
+        <translation type="unfinished">Овозможи попап прозорец при стартување</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="428"/>
+        <source>With this enabled, the popup would only show up if all chosen keys are
+in the pressed state when the word selection changes.</source>
+        <translation type="unfinished">Ос ова овозможено, попап би се појавил само ако сите избрани тастери се
+во притисната сосојба, кога избраните зборови не менуваат.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="432"/>
+        <source>Only show popup when all selected keys are kept pressed:</source>
+        <translation type="unfinished">Само покажи попап кога сите одабрани тастери непрекинато се притиснати:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="480"/>
+        <source>Left Ctrl only</source>
+        <translation type="unfinished">Само лев Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="483"/>
+        <source>Left Ctrl</source>
+        <translation type="unfinished">Лев Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="490"/>
+        <source>Right Shift only</source>
+        <translation type="unfinished">Само десен Shift</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="493"/>
+        <source>Right Shift</source>
+        <translation type="unfinished">Десен Shift</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="500"/>
+        <source>Alt key</source>
+        <translation>Тастер Alt</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="503"/>
+        <source>Alt</source>
+        <translation>Alt</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="510"/>
+        <source>Ctrl key</source>
+        <translation>Тастер Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="513"/>
+        <source>Ctrl</source>
+        <translation>Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="520"/>
+        <source>Left Alt only</source>
+        <translation type="unfinished">Само лев Alt</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="523"/>
+        <source>Left Alt</source>
+        <translation type="unfinished">Лев Alt</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="530"/>
+        <source>Shift key</source>
+        <translation>Тастер Shift</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="533"/>
+        <source>Shift</source>
+        <translation>Shift</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="540"/>
+        <source>Right Alt only</source>
+        <translation type="unfinished">Само десен Alt</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="543"/>
+        <source>Right Alt</source>
+        <translation type="unfinished">Десен Alt</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="550"/>
+        <source>Right Ctrl only</source>
+        <translation type="unfinished">Само десен Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="553"/>
+        <source>Right Ctrl</source>
+        <translation type="unfinished">Десен Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="560"/>
+        <source>Left Shift only</source>
+        <translation type="unfinished">Само лев Shift</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="563"/>
+        <source>Left Shift</source>
+        <translation type="unfinished">Лев Shift</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="570"/>
+        <source>Windows key or Meta key</source>
+        <translation>Тастер Windows или Meta</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="573"/>
+        <source>Win/Meta</source>
+        <translation>Win или Meta</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="622"/>
+        <source>Keys may also be pressed afterwards, within</source>
+        <translation type="unfinished">Копчињата исто така можат да бидат накнадно притиснати, во рамки на</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="629"/>
+        <source>To avoid false positives, the keys are only monitored
+after the selection&apos;s done for a limited amount of
+seconds, which is specified here.</source>
+        <translation type="unfinished">За да се избегнат лажни резултати, копчињата се следат
+по селекцијата направена во ограничен број
+секунди, кој  овде е определен.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="653"/>
+        <source>secs</source>
+        <translation type="unfinished">секунди</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="675"/>
+        <source>Send translated word to main window instead of to show it in popup window</source>
+        <translation type="unfinished">Пратете го преведениот збор во главниот прозорец наместо да се прикаже во попап прозорецот</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="678"/>
+        <source>Send translated word to main window</source>
+        <translation type="unfinished">Испратите го преведениот збор во главниот прозорец</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="899"/>
+        <source>Play audio files via FFmpeg(libav) and libao</source>
+        <translation type="unfinished">Пушти звучни датотеке преку FFmpeg(libav) и libao</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="902"/>
+        <source>Use internal player</source>
+        <translation type="unfinished">Користи вграден пуштач</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1121"/>
+        <source>Some sites detect GoldenDict via HTTP headers and block the requests.
+Enable this option to workaround the problem.</source>
+        <translation>Неки сајтови откривају GoldenDict преко HTTP заглавља и блок захтева.
+Омогућите ову могућност да бисте решили тај проблем.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1125"/>
+        <source>Do not identify GoldenDict in HTTP headers</source>
+        <translation type="unfinished">Немојте да го идентификувате GoldenDict у HTTP заглавја</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
+        <source>Ad&amp;vanced</source>
+        <translation>Напредно</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1352"/>
+        <source>ScanPopup extra technologies</source>
+        <translation type="unfinished">Додатни методи за одредување на зборот под курсорот</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1358"/>
+        <source>Try to use IAccessibleEx technology to retrieve word under cursor.
+This technology works only with some programs that support it
+ (for example Internet Explorer 9).
+It is not needed to select this option if you don&apos;t use such programs.</source>
+        <translation>Користите интерфејс IAccessibleEx да тражи речи под курсором.
+Ова технологија ради само са програмима који га подржавају
+(например Internet Explorer 9).
+Ако не користите такве програме не треба да укључи ову опцију.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1364"/>
+        <source>Use &amp;IAccessibleEx</source>
+        <translation>Користи &amp;IAccessibleEx</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1371"/>
+        <source>Try to use UI Automation technology to retrieve word under cursor.
+This technology works only with some programs that support it.
+It is not needed to select this option if you don&apos;t use such programs.</source>
+        <translation type="unfinished">Користи технологија UI Automation за барање зборови под курсорот.
+Оваа технологи работи само со програми кои го подржјуваат.
+Ако не користите такви програми не треба да ја вклучувате оваа опција.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1376"/>
+        <source>Use &amp;UIAutomation</source>
+        <translation>Користи &amp;UIAutomation</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1383"/>
+        <source>Try to use special GoldenDict message to retrieve word under cursor.
+This technology works only with some programs that support it.
+It is not needed to select this option if you don&apos;t use such programs.</source>
+        <translation type="unfinished">Користи специјални GoldenDict пораки за пребарување зборови под покажувачот.
+Оваа технологија работи само со програмите, кои ја подржуваат.
+Ако не користите такви програми не треба да ја вклучите оваа опциј.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1388"/>
+        <source>Use &amp;GoldenDict message</source>
+        <translation type="unfinished">Користи барање &amp;GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1398"/>
+        <source>History</source>
+        <translation>Историјат</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1404"/>
+        <source>Turn this option on to store history of the translated words</source>
+        <translation type="unfinished">Вклучете ја оваа могжност за чување историја на преведените зборови</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1407"/>
+        <source>Store &amp;history</source>
+        <translation type="unfinished">Склад на &amp;историјата</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1422"/>
+        <source>Specify the maximum number of entries to keep in history.</source>
+        <translation type="unfinished">Одреди најголем број ставки кои ќе се чуваат во историјата</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1425"/>
+        <source>Maximum history size:</source>
+        <translation type="unfinished">Максимална големина на историјата:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1462"/>
+        <source>History saving interval. If set to 0 history will be saved only during exit.</source>
+        <translation type="unfinished">Период на чување на историјата. Ако се постави на 0 историјата ќесе чува само додека не излеземе.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1468"/>
+        <source>Save every</source>
+        <translation type="unfinished">Меморирај на секои</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1485"/>
+        <source>minutes</source>
+        <translation type="unfinished">минути</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1510"/>
+        <source>Articles</source>
+        <translation type="unfinished">Статии</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1516"/>
+        <source>Turn this option on to always expand optional parts of articles</source>
+        <translation type="unfinished">Вклуч. ја оваа можност за секогаш да ги рашири незадолж. делови на стат.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1519"/>
+        <source>Expand optional &amp;parts</source>
+        <translation type="unfinished">Можност за ширење на &amp;деловите</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
+        <source>Select this option to automatic collapse big articles</source>
+        <translation type="unfinished">Одберете ја оваа можност за авт. да се собираат големите статии</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1531"/>
+        <source>Collapse articles more than</source>
+        <translation type="unfinished">Вруши статии поголеми од</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1538"/>
+        <source>Articles longer than this size will be collapsed</source>
+        <translation type="unfinished">Статии подолги од оваа величина ќе бидат срушени</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1554"/>
+        <source>symbols</source>
+        <translation>симболи</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="813"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Note: You appear to be running an X.Org XServer release which has the RECORD extension broken. Hotkeys in GoldenDict will probably not work. This must be fixed in the server itself. Please refer to the following &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug entry&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; and leave a comment there if you like.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Напомена: Чини се да користите верзију X.Org XServer, у којој не постоји подршка за проширење RECORD. Вероватно пречице GoldenDict не раде. Овај проблем би требало да буде исправљен на страни XServer. За више информација погледајте &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug entry&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; а ако желите, поставите своје коментаре.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="851"/>
+        <source>&amp;Audio</source>
+        <translation>&amp;Аудио</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="870"/>
+        <source>Pronunciation</source>
+        <translation>Изговор</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="876"/>
+        <source>Auto-pronounce words in main window</source>
+        <translation type="unfinished">Автоматски изговари зборови во главниот прозорец</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="883"/>
+        <source>Auto-pronounce words in scan popup</source>
+        <translation type="unfinished">Автоматски изговори зборови во скокачки прозорец</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="893"/>
+        <source>Playback</source>
+        <translation>Репродукција</translation>
+    </message>
+    <message>
+        <source>Use Windows native playback API. Limited to .wav files only,
+but works very well.</source>
+        <translation type="obsolete">Коришћење интерних фондова Windows за репродукцију. Подржава
+само датотеке типа .wav, али репродукција увек ради добро.</translation>
+    </message>
+    <message>
+        <source>Play via Windows native API</source>
+        <translation type="obsolete">Репродукуј унутрашњим ресурсима Windows-а</translation>
+    </message>
+    <message>
+        <source>Play audio via Phonon framework. May be somewhat unstable,
+but should support most audio file formats.</source>
+        <translation type="obsolete">Репродукуј кроз систем Phonon. Понекад ради нестабилно,
+али подржава већину аудио формате.</translation>
+    </message>
+    <message>
+        <source>Play via Phonon</source>
+        <translation type="obsolete">Репродукуј преко Phonon</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="911"/>
+        <source>Use any external program to play audio files</source>
+        <translation type="unfinished">Користи некоја надворешна апликација за репродукција на аудио датотеки</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="914"/>
+        <source>Use external program:</source>
+        <translation type="unfinished">Користи надворешен програм:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="951"/>
+        <source>&amp;Network</source>
+        <translation>&amp;Мрежа</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="970"/>
+        <source>Enable if you wish to use a proxy server
+for all program&apos;s network requests.</source>
+        <translation type="unfinished">Омозможи ако користите прокси сервер
+за сите мрежни побарувања на програмот.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="974"/>
+        <source>Use proxy server</source>
+        <translation>Користи прокси-сервер</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1008"/>
+        <source>Type:</source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1018"/>
+        <source>Host:</source>
+        <translation>Сервер:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1028"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1049"/>
+        <source>User:</source>
+        <translation>Корисничко име:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1059"/>
+        <source>Password:</source>
+        <translation>Лозинка:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1097"/>
+        <source>Enabling this would make GoldenDict block most advertisements
+by disallowing content (images, frames) not originating from the site
+you are browsing. If some site breaks because of this, try disabling this.</source>
+        <translation type="unfinished">Оваа опција овозможува GoldenDictда ги  блокира повеќето
+реклами  со оневозможување на одредени садржини (слики, рамки, и т.н.),
+кои не произлегуваат од ориг. сајт. Ако некои сајтови се рушат
+поради оваа функција, обидете се да ја оневозможите оваа опција.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1102"/>
+        <source>Disallow loading content from other sites (hides most advertisements)</source>
+        <translation type="unfinished">Оневозможи вчитување садржини од други сајтови (отстранува поголем дел од огласите)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1109"/>
+        <source>Enabling this would allow to listen to sound pronunciations from
+online dictionaries that rely on Flash or other web plugins.
+Plugin must be installed for this option to work.</source>
+        <translation type="unfinished">Оваа опција ви омозможува слушање изговор од надвор.
+сајтови, кои  се потпираат на Flash или други додатоци.
+За ова да функционира, додатоците треба да се инсталираат.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1114"/>
+        <source>Enable web plugins</source>
+        <translation type="unfinished">Омозможи веб додатаци</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1148"/>
+        <source>When this is enabled, the program periodically
+checks if a new, updated version of GoldenDict
+is available for download. If it is so, the program
+informs the user about it and prompts to open a
+download page.</source>
+        <translation type="unfinished">Ако е оваа опција е омозможена, програмот, од време на
+време ќе провери за најнова верзија
+GoldenDict. Ако се појави нова верзија,  програмот
+ќе извести за тоа и понуди да го преземе
+од сајтот.</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1155"/>
+        <source>Check for new program releases periodically</source>
+        <translation type="unfinished">Провери нова верзија</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="58"/>
+        <source>System default</source>
+        <translation type="unfinished">Систем - подразбирано</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
+        <source>Default</source>
+        <translation type="unfinished">Подразбирано</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="140"/>
+        <source>Modern</source>
+        <translation type="unfinished">Модерен</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="141"/>
+        <source>Lingvo</source>
+        <translation>Lingvo</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="142"/>
+        <source>Babylon</source>
+        <translation>Babylon</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="143"/>
+        <source>Lingoes</source>
+        <translation>Lingoes</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="144"/>
+        <source>Lingoes-Blue</source>
+        <translation>Lingoes-Blue</translation>
+    </message>
+    <message>
+        <source>Play via DirectShow</source>
+        <translation type="obsolete">Репродукуј преко DirectShow</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="552"/>
+        <source>Changing Language</source>
+        <translation type="unfinished">Промена на јазик</translation>
+    </message>
+    <message>
+        <location filename="../preferences.cc" line="553"/>
+        <source>Restart the program to apply the language change.</source>
+        <translation>Поново покрените програм за промену језика.</translation>
+    </message>
+</context>
+<context>
+    <name>ProgramTypeEditor</name>
+    <message>
+        <location filename="../sources.cc" line="1030"/>
+        <source>Audio</source>
+        <translation>Аудио</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1032"/>
+        <source>Plain Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1034"/>
+        <source>Html</source>
+        <translation>Html</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1036"/>
+        <source>Prefix Match</source>
+        <translation type="unfinished">По префикси</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1038"/>
+        <source>Unknown</source>
+        <translation>Непознато</translation>
+    </message>
+</context>
+<context>
+    <name>Programs::RunInstance</name>
+    <message>
+        <location filename="../programs.cc" line="176"/>
+        <source>No program name was given.</source>
+        <translation>Програм није наведен.</translation>
+    </message>
+    <message>
+        <location filename="../programs.cc" line="192"/>
+        <source>The program has crashed.</source>
+        <translation>Програм је завршио са грешком</translation>
+    </message>
+    <message>
+        <location filename="../programs.cc" line="195"/>
+        <source>The program has returned exit code %1.</source>
+        <translation>Програм је вратио излазни код %1.</translation>
+    </message>
+</context>
+<context>
+    <name>ProgramsModel</name>
+    <message>
+        <location filename="../sources.cc" line="938"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Вклучено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="940"/>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="942"/>
+        <source>Name</source>
+        <translation>Назив</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="944"/>
+        <source>Command Line</source>
+        <translation>Командна линија</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="946"/>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
+        <source>Article loading error</source>
+        <translation type="unfinished">Грешка при вчитување статија</translation>
+    </message>
+    <message>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
+        <source>Article decoding error</source>
+        <translation>Грешка декодирања чланка</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="140"/>
+        <source>avformat_alloc_context() failed.</source>
+        <translation>avformat_alloc_context() није успело.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="147"/>
+        <source>av_malloc() failed.</source>
+        <translation>av_malloc() није успело.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="156"/>
+        <source>avio_alloc_context() failed.</source>
+        <translation>avio_alloc_context() није успело.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="173"/>
+        <source>avformat_open_input() failed: %1.</source>
+        <translation>avformat_open_input() није успело: %1.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="180"/>
+        <source>avformat_find_stream_info() failed: %1.</source>
+        <translation>avformat_find_stream_info() није успело: %1.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="195"/>
+        <source>Could not find audio stream.</source>
+        <translation>Није могуће пронаћи аудио ток.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="203"/>
+        <source>Codec [id: %1] not found.</source>
+        <translation>Кодек [id: %1] није пронађен.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="210"/>
+        <source>avcodec_open2() failed: %1.</source>
+        <translation>avcodec_open2() није успело: %1.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="271"/>
+        <source>Cannot find usable audio output device.</source>
+        <translation>Не можете да пронађете употребљив уређај за звучни излаз.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="284"/>
+        <source>Unsupported sample format.</source>
+        <translation>Неподржан је пробни формат.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="294"/>
+        <source>ao_open_live() failed: </source>
+        <translation>ao_open_live() није успело: </translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="299"/>
+        <source>No driver.</source>
+        <translation>Нема управљача.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="302"/>
+        <source>This driver is not a live output device.</source>
+        <translation>Овај управљач нема активан излазни уређај.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="305"/>
+        <source>A valid option key has an invalid value.</source>
+        <translation>Важећи избор тастера има неважећу вредност.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="308"/>
+        <source>Cannot open the device: %1, channels: %2, rate: %3, bits: %4.</source>
+        <translation>Не могу да отворим уређај: %1, канали: %2, мера: %3, бита: %4.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="315"/>
+        <source>Unknown error.</source>
+        <translation>Непозната грешка.</translation>
+    </message>
+    <message>
+        <location filename="../ffmpegaudio.cc" line="340"/>
+        <source>avcodec_alloc_frame() failed.</source>
+        <translation>avcodec_alloc_frame() није успело.</translation>
+    </message>
+</context>
+<context>
+    <name>QuickFilterLine</name>
+    <message>
+        <location filename="../groups_widgets.cc" line="1023"/>
+        <source>Dictionary search/filter (Ctrl+F)</source>
+        <translation>Речник - претрага/филтер (Ctrl+F)</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="1032"/>
+        <source>Quick Search</source>
+        <translation>Брза претрага</translation>
+    </message>
+    <message>
+        <location filename="../groups_widgets.cc" line="1037"/>
+        <source>Clear Search</source>
+        <translation>Очисти претрагу</translation>
+    </message>
+</context>
+<context>
+    <name>ResourceToSaveHandler</name>
+    <message>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
+        <source>ERROR: %1</source>
+        <translation>ГРЕШКА: %1</translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="2637"/>
+        <source>Resource saving error: </source>
+        <translation>Грешка чувања ресурса: </translation>
+    </message>
+    <message>
+        <location filename="../articleview.cc" line="2644"/>
+        <source>The referenced resource failed to download.</source>
+        <translation>Није могуће учитати повезане ресурсе.</translation>
+    </message>
+</context>
+<context>
+    <name>Romaji</name>
+    <message>
+        <location filename="../romaji.cc" line="108"/>
+        <source>Hepburn Romaji for Hiragana</source>
+        <translation>Хепберн Ромаји (Хирагана)</translation>
+    </message>
+    <message>
+        <location filename="../romaji.cc" line="117"/>
+        <source>Hepburn Romaji for Katakana</source>
+        <translation>Хепберн Ромаји (Катакана)</translation>
+    </message>
+</context>
+<context>
+    <name>RussianTranslit</name>
+    <message>
+        <location filename="../russiantranslit.cc" line="107"/>
+        <source>Russian Transliteration</source>
+        <translation>Транслитерација (Руски)</translation>
+    </message>
+</context>
+<context>
+    <name>ScanPopup</name>
+    <message>
+        <location filename="../scanpopup.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished">Дијалог</translation>
+    </message>
+    <message>
+        <source>word</source>
+        <translation type="obsolete">реч</translation>
+    </message>
+    <message>
+        <source>List Matches (Alt+M)</source>
+        <translation type="obsolete">Списак подударности (Alt+M)</translation>
+    </message>
+    <message>
+        <source>Alt+M</source>
+        <translation type="obsolete">Alt+M</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="113"/>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="127"/>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="141"/>
+        <source>Pronounce Word (Alt+S)</source>
+        <translation type="unfinished">Изговори збор (Alt+S)</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="151"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="161"/>
+        <source>Send word to main window (Alt+W)</source>
+        <translation type="unfinished">Испрати збор во главен прозорец (Alt+W)</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="171"/>
+        <source>Alt+W</source>
+        <translation>Alt+W</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="191"/>
+        <source>Shows or hides the dictionary bar</source>
+        <translation type="unfinished">Прикажување или скривање лента на речници</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="214"/>
+        <source>Use this to pin down the window so it would stay on screen,
+could be resized or managed in other ways.</source>
+        <translation type="unfinished">Кликните за да го усидрите прозорецот на екранот, промените големината
+или било која друга особина.</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
+</context>
+<context>
+    <name>SoundDirsModel</name>
+    <message>
+        <location filename="../sources.cc" line="1228"/>
+        <source>Path</source>
+        <translation type="unfinished">Патека</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1230"/>
+        <source>Name</source>
+        <translation>Назив</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="1232"/>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
+</context>
+<context>
+    <name>Sources</name>
+    <message>
+        <location filename="../sources.cc" line="110"/>
+        <source>Text to Speech</source>
+        <translation type="unfinished">Текст во говор</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="126"/>
+        <source>(not available in portable version)</source>
+        <translation type="unfinished">(не е достапно во преносна верзија)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
+        <source>Choose a directory</source>
+        <translation type="unfinished">Одбери папка</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
+        <source>Confirm removal</source>
+        <translation type="unfinished">Потврди отстранување</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
+        <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation type="unfinished">Отстрани папка &lt;b&gt;%1&lt;/b&gt; од список?</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
+        <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation type="unfinished">Отстрани веб локација &lt;b&gt;%1&lt;/b&gt; од список?</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="317"/>
+        <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation type="unfinished">Отстрани програм &lt;b&gt;%1&lt;/b&gt; ид список?</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="37"/>
+        <source>Files</source>
+        <translation type="unfinished">Датотеки</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="43"/>
+        <source>Paths to search for the dictionary files:</source>
+        <translation type="unfinished">Патека за пребарување датотеки на речникот:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="57"/>
+        <location filename="../sources.ui" line="120"/>
+        <location filename="../sources.ui" line="244"/>
+        <location filename="../sources.ui" line="303"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
+        <source>&amp;Add...</source>
+        <translation type="unfinished">&amp;Додади...</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="64"/>
+        <location filename="../sources.ui" line="127"/>
+        <location filename="../sources.ui" line="251"/>
+        <location filename="../sources.ui" line="310"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
+        <source>&amp;Remove</source>
+        <translation type="unfinished">&amp;Отстрани</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="84"/>
+        <source>Re&amp;scan now</source>
+        <translation type="unfinished">Пов&amp;торно прегледај</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="100"/>
+        <source>Sound Dirs</source>
+        <translation type="unfinished">Папка со звуци</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="106"/>
+        <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
+        <translation type="unfinished">Направи речници од куп звучни датотеи со додавање на патека овде:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="156"/>
+        <source>Morphology</source>
+        <translation>Морфологија</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="162"/>
+        <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
+        <translation type="unfinished">Патека до речник со Hunspell/Myspell речници:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="178"/>
+        <source>&amp;Change...</source>
+        <translation>&amp;Промени...</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="187"/>
+        <source>Available morphology dictionaries:</source>
+        <translation type="unfinished">Достапни морфолошки речници:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="199"/>
+        <source>Each morphology dictionary appears as a
+separate auxiliary dictionary which
+provides stem words for searches and
+spelling suggestions for mistyped words.
+Add appropriate dictionaries to the bottoms
+of the appropriate groups to use them.</source>
+        <translation type="unfinished">Секој морфолошки речник
+е посебен помошен речник кој
+обезбедува матични зборови за пребар. и
+дава предлози за правопис 
+за грешни зборови.
+За користење на речникот
+додадите соодветни речници
+на крајот на одредени групи.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="283"/>
+        <source>Websites</source>
+        <translation type="unfinished">Веб-сајтови</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="289"/>
+        <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
+        <translation type="unfinished">Било кој веб-сајт. Низот %GDWORD% ќе биде заменет со зборот од прашалникот:</translation>
+    </message>
+    <message>
+        <source>Alternatively, use %GD1251% for CP1251, %GDISO1% for ISO 8859-1.</source>
+        <translation type="obsolete">Такође је могуће користити %GD1251% за кодирање CP1251, %GDISO1% за ISO 8859-1.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="403"/>
+        <source>Programs</source>
+        <translation>Програми</translation>
+    </message>
+    <message>
+        <source>Any external programs. A string %GDWORD% will be replaced with the query word. The word will also be fed into standard input.</source>
+        <translation type="obsolete">Сваки екстерни програм. Низ %GDWORD% ће бити замењена траженом речју. Иста реч ће бити послата у стандардни улазни ток.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="462"/>
+        <source>Forvo</source>
+        <translation>Forvo</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="474"/>
+        <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
+        <translation>Уживо изговор са сајта &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Овај сајт омогућава корисницима да снимају и деле изговорене речи. Можете да их слушам из GoldenDict.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="487"/>
+        <source>Enable pronunciations from Forvo</source>
+        <translation>Укључи изговор из Forvo</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="517"/>
+        <source>API Key:</source>
+        <translation>Кључ API:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="524"/>
+        <source>Use of Forvo currently requires an API key. Leave this field
+blank to use the default key, which may become unavailable
+in the future, or register on the site to get your own key.</source>
+        <translation>Користећи сајт Forvo захтева кључ API. Оставите
+ово поље празно, да бисте користили подразумевани кључ, који
+не може да ради у будућности, или се пријавите на
+сајт, да бисте добили свој кључ.</translation>
+    </message>
+    <message>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;, or leave blank to use the default one.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="obsolete">Узмите ваш кључ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;овде&lt;/a&gt;, или оставите празно да бисте користили подразумевани кључ.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="334"/>
+        <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
+%GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
+        <translation>Алтернативно, користите %GD1251% за CP1251, %GDISO1%...%GDISO16% за ISO 8859-1...ISO 8859-16 односно,
+%GDBIG5% за Big-5, %GDBIG5HKSCS% за Big5-HKSCS, %GDGBK% за GBK и GB18030, %GDSHIFTJIS% за Shift-JIS.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
+        <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
+        <translation>Неки спољни програми. Низ %GDWORD% биће замењен речју упита. Ако такав низ није представљен, реч ће се учитати у стандардни улаз.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="549"/>
+        <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
+        <translation type="unfinished">Снабдете се со свој клуч &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, или оставете празно за да користите подразбиран.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="562"/>
+        <source>Language codes (comma-separated):</source>
+        <translation type="unfinished">Листа на јазични кодова (разделени со запирки):</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="569"/>
+        <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
+        <translation type="unfinished">Листа на кодови за јазици кои сакате да ги користите. Пример: &quot;en, ru&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="592"/>
+        <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
+        <translation type="unfinished">Комплетен список на језичните кодови е достапен &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;овде&lt;/a&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="634"/>
+        <source>Transliteration</source>
+        <translation>Транслитерација</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="655"/>
+        <source>Russian transliteration</source>
+        <translation>Транслитерација (Руски)</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="666"/>
+        <source>Greek transliteration</source>
+        <translation>Транслитерација (Грчки)</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="690"/>
+        <source>German transliteration</source>
+        <translation>Транслитерација (Немачки)</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="701"/>
+        <source>Belarusian transliteration</source>
+        <translation>Белоруска транслитерација</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="727"/>
+        <source>Enables to use the Latin alphabet to write the Japanese language</source>
+        <translation type="unfinished">Омозможува користење латиница за пишување јапонски</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="730"/>
+        <source>Japanese Romaji</source>
+        <translation type="unfinished">Ромаји (Јапонски)</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="742"/>
+        <source>Systems:</source>
+        <translation>Системи:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="749"/>
+        <source>The most widely used method of transcription of Japanese,
+based on English phonology</source>
+        <translation type="unfinished">Најпопуларен метод за транскрипција на Јапонски е,
+заснован на англиска фонологија</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="753"/>
+        <source>Hepburn</source>
+        <translation>Хепберн</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="763"/>
+        <source>The most regular system, having a one-to-one relation to the
+kana writing systems. Standardized as ISO 3602
+
+Not implemented yet in GoldenDict.</source>
+        <translation>Систем, пренос приказа знакова кана је најтачније.
+Стандардизовани у ISO 3602.
+
+В GoldenDict пока не реализована.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="769"/>
+        <source>Nihon-shiki</source>
+        <translation>Nihon-shiki</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="779"/>
+        <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
+Standardized as ISO 3602
+
+Not implemented yet in GoldenDict.</source>
+        <translation>На основу система Nihon-shiki, али модификован за модерне стандарде
+савременог јапанског. Стандардизован у ISO 3602.
+
+В GoldenDict пока не реализована.</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="785"/>
+        <source>Kunrei-shiki</source>
+        <translation>Kunrei-shiki</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="792"/>
+        <source>Syllabaries:</source>
+        <translation>Слоговна азбука:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="799"/>
+        <source>Hiragana Japanese syllabary</source>
+        <translation>Слоговна азбука &quot;Хирагана&quot;</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="802"/>
+        <source>Hiragana</source>
+        <translation>Хирагана</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="809"/>
+        <source>Katakana Japanese syllabary</source>
+        <translation>Слоговна азбука &quot;Катакана&quot;</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="812"/>
+        <source>Katakana</source>
+        <translation>Катакана</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="224"/>
+        <source>Wikipedia</source>
+        <translatorcomment>Написан на руском, извор: ru.wikipedia.org</translatorcomment>
+        <translation>Википедија</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="230"/>
+        <source>Wikipedia (MediaWiki) sites:</source>
+        <translation>Веб-сајт Википедија (MediaWiki):</translation>
+    </message>
+</context>
+<context>
+    <name>StylesComboBox</name>
+    <message>
+        <location filename="../stylescombobox.cc" line="17"/>
+        <source>None</source>
+        <translation>Ништа</translation>
+    </message>
+</context>
+<context>
+    <name>TextToSpeechSource</name>
+    <message>
+        <location filename="../texttospeechsource.ui" line="33"/>
+        <source>Selected voice engines:</source>
+        <translation>Изабраи погон на гласот:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="53"/>
+        <source>&amp;Add</source>
+        <translation>&amp;Додај</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="60"/>
+        <source>&amp;Remove</source>
+        <translation>&amp;Уклони</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="84"/>
+        <source>Preferences</source>
+        <translation>Поставке</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="90"/>
+        <source>Volume:</source>
+        <translation>Величина:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="119"/>
+        <source>Rate:</source>
+        <translation>Мера:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="151"/>
+        <source>Preview</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="165"/>
+        <source>Available voice engines:</source>
+        <translation>Доступни гласовни погони:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="183"/>
+        <source>Text to be previewed:</source>
+        <translation>Текст се може погледати:</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="190"/>
+        <source>Type text to be previewed here.</source>
+        <translation>Укуцајте текст да буде прегледан овде.</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.ui" line="224"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Преглед</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="58"/>
+        <source>No TTS voice available</source>
+        <translation>Нема доступног TTS гласа</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="59"/>
+        <source>Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</source>
+        <translation>Не можете да пронађете доступне TTS гласове.&lt;br&gt;Уверите се да је најмање један TTS погон већ инсталиран на рачунару.</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="79"/>
+        <source>Confirm removal</source>
+        <translation>Потврди уклањање</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="80"/>
+        <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
+        <translation>Уклоните гласовну погон &lt;b&gt;%1&lt;/b&gt; са списка?</translation>
+    </message>
+</context>
+<context>
+    <name>TranslateBox</name>
+    <message>
+        <location filename="../translatebox.cc" line="103"/>
+        <source>Type a word or phrase to search dictionaries</source>
+        <translation type="unfinished">Напишете збор или фраза за пребарување на речникот</translation>
+    </message>
+    <message>
+        <location filename="../translatebox.cc" line="125"/>
+        <source>Drop-down</source>
+        <translation type="unfinished">Паѓачки</translation>
+    </message>
+</context>
+<context>
+    <name>VoiceEnginesModel</name>
+    <message>
+        <location filename="../texttospeechsource.cc" line="233"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Вклучено</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="235"/>
+        <source>Name</source>
+        <translation>Ништо</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="237"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="../texttospeechsource.cc" line="239"/>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
+</context>
+<context>
+    <name>WebSitesModel</name>
+    <message>
+        <location filename="../sources.cc" line="606"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Вклучено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="608"/>
+        <source>Name</source>
+        <translation>Назив</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="610"/>
+        <source>Address</source>
+        <translation>Додадено %1</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="612"/>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
+</context>
+<context>
+    <name>WordFinder</name>
+    <message>
+        <location filename="../wordfinder.cc" line="203"/>
+        <source>Failed to query some dictionaries.</source>
+        <translation>Прикажи име во картичката на речникот</translation>
+    </message>
+</context>
+<context>
+    <name>WordList</name>
+    <message>
+        <location filename="../wordlist.cc" line="113"/>
+        <source>WARNING: %1</source>
+        <translation type="unfinished">ПРЕДУПРЕДУВАЊЕ: %1</translation>
+    </message>
+</context>
+</TS>
diff -Nru goldendict-1.5.0~git20131003/locale/nl_NL.ts goldendict-1.5.0~git20150923/locale/nl_NL.ts
--- goldendict-1.5.0~git20131003/locale/nl_NL.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/nl_NL.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Onbekend]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Gebaseerd op Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,32 +42,32 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Artikel uitvouwen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Artikel samenvouwen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Geen vertaling voor &lt;b&gt;%2&lt;/b&gt; gevonden in de groep &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Geen vertaling gevonden in de groep &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Welkom!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Welkom bij &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Om met het programma te kunnen werken kiest u eerst &lt;b&gt;Bewerken &gt; Woordenboeken&lt;/b&gt;. U kunt vervolgens enkele mappen toevoegen waarin naar woordenboekbestanden wordt gezocht, Wikipedia sites of andere bronnen opgeven, of de woordenboekvolgorde aanpassen en woordenboekgroepen aanmaken.&lt;/p&gt;
 &lt;p&gt;Hierna bent u klaar om woorden op te zoeken met behulp van het deelvenster aan de linkerkant. Bovendien kunt u &lt;a href=&quot;Met popups werken&quot;&gt;woorden opzoeken vanuit andere programma&apos;s&lt;/a&gt;. &lt;/p&gt;
@@ -75,32 +75,32 @@
 &lt;p&gt;Hebt u meer hulp nodig, wilt u iets vragen, hebt u suggesties of bent u benieuwd naar de mening van andere gebruikers, bezoek dan het &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;. Programma updates kunt u vinden op de &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt;.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Gebruiksrecht verleend onder GPLv3 of nieuwer.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Met popups werken</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Met popups werken&lt;/h3&gt;Om woorden op te zoeken vanuit andere actieve programma&apos;s moet u eerst de &lt;i&gt;&apos;Scan Popup modus&apos;&lt;/i&gt; inschakelen onder &lt;b&gt;Instellingen&lt;/b&gt;. Daarna kunt u deze functionaliteit op elk moment activeren door middel van het popup pictogram in de werkbalk hierboven of door rechts te klikken op het systeemvakpictogram en in het menu de betreffende optie te kiezen. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Als u vervolgens in een ander programma met de muisaanwijzer stopt boven een woord dat u wilt opzoeken, dan verschijnt er een venster met een beschrijving van het betreffende woord.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Daarna kunt elk woord dat u wilt opzoeken in een ander programma met de muis selecteren (dubbelklikken of slepend selecteren), waarna een venster verschijnt met de beschrijving van het betreffende woord.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(naamloos)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(afbeelding)</translation>
     </message>
@@ -108,37 +108,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Artikel uitvouwen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Uit </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Artikel samenvouwen</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Fout in zoekopdracht: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Soortgelijke woorden: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Samengestelde treffers: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Individuele woorden: </translation>
     </message>
@@ -146,57 +146,57 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Huidig artikel selecteren</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Kopiëren als tekst</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspecteren</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Bron</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS Stem</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Afbeelding</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definitie uit woordenboek &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definitie: %1</translation>
     </message>
@@ -205,38 +205,39 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>De bron waarnaar wordt verwezen bestaat niet.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Dit programma voor afspelen van geluiden bestaat niet.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>FOUT: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Geluid opslaan</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Geluidsbestanden (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Alle bestanden (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Afbeelding opslaan</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Afbeeldingsbestanden (*.bmp *.jpg *.png *.tif);;Alle bestanden (*.*)</translation>
     </message>
@@ -245,53 +246,53 @@
         <translation type="obsolete">Fout bij opslaan bron:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>Koppeling &amp;openen</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Koppeling openen in nieuw&amp;tabblad</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Koppeling openen in &amp;externe browser</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Zoeken naar &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Zoeken naar &quot;%1&quot; in een &amp;nieuw tabblad</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Verzend &quot;%1&quot; naar zoekveld</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>Voeg &quot;%1&quot; &amp;toe aan geschiedenis</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Zoeken naar &quot;%1&quot; in %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Zoeken naar &quot;%1&quot; in %2 in een &amp;nieuw tabblad</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>WAARSCHUWING:FFmpeg audiospeler: %1</translation>
     </message>
@@ -312,37 +313,37 @@
         <translation type="obsolete">Bass bibliotheek kan dit geluid niet afspelen.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Kan geen mediaspeler starten om het geluidsbestand af te spelen: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Tijdelijk bestand kan niet worden aangemaakt.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Kan bronbestand niet automatisch openen, probeer het handmatig te openen: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Kan de bron waarnaar wordt verwezen niet downloaden.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>&amp;Afbeelding opslaan...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>&amp;Geluid opslaan...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>WAARSCHUWING: %1</translation>
     </message>
@@ -352,42 +353,44 @@
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Zoeken:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Vorige</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Volgende</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Hoofdlettergevoelig</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Alles &amp;markeren</translation>
     </message>
@@ -413,6 +416,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Wachtwoord:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -513,6 +539,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Tekst bestanden (*.txt);;Alle bestanden (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuleren</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -555,6 +694,16 @@
         <translation>Beschrijving:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -571,6 +720,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Ingeschakeld</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Naam</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Adres</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Pictogram</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -592,17 +809,22 @@
         <translation>Deze groep bewerken</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Woordenboek informatie</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Woordenboekmap openen</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Woordenboek bewerken</translation>
     </message>
@@ -610,39 +832,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Bronnen</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Woordenboeken</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Groepen</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Bronnen gewijzigd</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Enkele bronnen zijn gewijzigd. Wilt u de wijzigingen accepteren?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Accepteren</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
@@ -661,6 +883,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Geen</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Geen</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -699,6 +1007,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -738,43 +1105,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Groep toevoegen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Voer een naam in voor de nieuwe groep:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Groep hernoemen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Nieuwe naam voor de groep:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Groep verwijderen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Weet u zeker dat u de groep &lt;b&gt;%1&lt;/b&gt; wilt verwijderen?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Alle groepen verwijderen</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Weet u zeker dat u alle groepen wilt verwijderen?</translation>
     </message>
@@ -875,6 +1252,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Terug</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Vooruit</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Vergroten</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Verkleinen</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normale grootte</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -905,12 +1330,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Spellingsuggesties:</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfologie %1</translation>
     </message>
@@ -918,12 +1343,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
@@ -1963,7 +2388,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Fout bij laden woordenboeken</translation>
     </message>
@@ -1971,7 +2396,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Fout in configuratiebestand. Doorgaan met standaardinstellingen?</translation>
     </message>
@@ -1983,18 +2408,18 @@
         <translation type="obsolete">Zeige Namen in Wörterbuchleiste</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Menubalk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Opzoeken in:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Gevonden in woordenboeken:</translation>
     </message>
@@ -2003,226 +2428,237 @@
         <translation type="obsolete">Navigation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Terug</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Vooruit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Scan Popup</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Woord uitspreken (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Vergroten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Verkleinen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Normale grootte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Zoekwoorden vergroten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Zoekwoorden verkleinen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Zoekwoorden normale grootte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>&amp;Hoofdvenster weergeven</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Huidig tabblad sluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Alle tabbladen sluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Alle andere tabbladen sluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Toegankelijkheid API is niet ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artikel, compleet (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artikel, alleen HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Artikel opslaan...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Het hoofdvenster wordt nu altijd op de voorgrond weergegeven.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Verbergen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Geschiedenis opslaan als bestand</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Tekst bestanden (*.txt);;Alle bestanden (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Geschiedenis exporteren voltooid</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Fout bij exporteren:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Geschiedenis importeren uit bestand</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Fout bij importeren: bestand bevat onjuiste gegevens</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Geschiedenis importeren voltooid</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Fout bij importeren:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Woordenboekinformatie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Woordenboekmap openen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Woordenboek bewerken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Laden...</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Welkom!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 Woordenboeken, %2 Artikelen, %3 Woorden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Opzoeken:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Alle groepen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Geopende tabbladen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Woordenboekwerkbalk met &amp;tekst</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Werkbalken met &amp;kleine pictogrammen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigatiewerkbalk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Tabbladlijst openen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(naamloos)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2235,57 +2671,57 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Bewakingsmechanisme voor sneltoetsen kan niet worden geïnitialiseerd.&lt;br&gt;Zorg ervoor dat de RECORD-extensie van uw XServer is ingeschakeld.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Nieuwe versie beschikbaar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Versie &lt;b&gt;%1&lt;/b&gt; van GoldenDict kan nu gedownload worden.&lt;br&gt;Klik op &lt;b&gt;downloaden&lt;/b&gt; om naar de downloadpagina te gaan.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Downloaden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Deze versie overslaan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>U hebt ervoor gekozen om de menubalk te verbergen. Druk op %1 om deze weer zichtbaar te maken.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Pagina-instelling</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Geen printer beschikbaar. U moet er eerst één installeren.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Artikel afdrukken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Artikel opslaan als</translation>
     </message>
@@ -2294,42 +2730,42 @@
         <translation type="obsolete">Html bestanden (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Kan artikel niet opslaan: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Bestand</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>Be&amp;werken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>Beel&amp;d</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>Z&amp;oomen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Geschiedenis</translation>
     </message>
@@ -2338,12 +2774,12 @@
         <translation type="obsolete">Suchformular</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>Woorden&amp;boeken...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
@@ -2352,148 +2788,178 @@
         <translation type="obsolete">&amp;Gruppen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Zoekvenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Navigatievenster zoek&amp;resultaten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Geschiedenisvenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Instellingen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Website</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Over</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Over GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Programma afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Sluiten naar systeemvak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimaliseren naar systeemvak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>Artikel &amp;opslaan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Artikel opslaan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>Af&amp;drukken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Pagina-instelling</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Afdruk&amp;voorbeeld</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Bestanden opnieuw &amp;inlezen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nieuw tabblad</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Altijd op de voorgrond</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Altijd op de voorgrond</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Menuknop</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Druckvorschau</translation>
     </message>
@@ -2502,48 +2968,48 @@
         <translation type="obsolete">Dateien neu einlesen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Wissen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nieuw tabblad</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Configuratiemap</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Weergeven</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exporteren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importeren</translation>
     </message>
@@ -2551,12 +3017,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Woordenboekbestand is gemanipuleerd of beschadigd</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Kan artikel niet laden van %1, reden: %2</translation>
     </message>
@@ -2564,7 +3030,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML parseerfout: %1 op %2,%3</translation>
     </message>
@@ -2572,7 +3038,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML parseerfout: %1 op %2,%3</translation>
     </message>
@@ -2580,22 +3046,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Pictogram</translation>
     </message>
@@ -2608,88 +3074,94 @@
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Woordenboekvolgorde:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Inactieve (uitgeschakelde) woordenboeken:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informatie over dit woordenboek</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Totaal aantal artikelen:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Totaal aantal woorden:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Vertaalt van:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Vertaalt naar:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Beschrijving:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Woordenboek bestaat uit de volgende bestanden:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Verander de volgorde door items te slepen en verplaats woordenboeken naar de inactieve groep om ze uit te schakelen.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Sorteren op naam</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Sorteren op taal</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Pad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Recursief</translation>
     </message>
@@ -2697,37 +3169,38 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Systeemstandaard</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Standaard</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blauw</translation>
     </message>
@@ -2736,12 +3209,12 @@
         <translation type="obsolete">Afspelen met DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Toepassingstaal wijzigen</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Start het programma opnieuw om de toepassingstaal te wijzigen.</translation>
     </message>
@@ -2843,12 +3316,12 @@
         <translation>Weergavestijl:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Scan Popup</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2858,7 +3331,7 @@
 U kunt dit in- of uitschakelen in het hoofdvenster of via het systeemvakpictogram.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>De Scan Popup modus inschakelen</translation>
     </message>
@@ -2916,141 +3389,146 @@
         <translation>Add-on stijl:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Pas deze waarde aan om zeer lange contextmenu&apos;s te voorkomen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Woordenboeken in contextmenu beperken tot:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Hier kunt u aangeven of de Scan Popup modus standaard in- of uitgeschakeld is.
 Het programma start met de Scan Popup modus ingeschakeld als dit geselecteerd is.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Starten met Scan Popup ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Als dit ingeschakeld is wordt de popup alleen weergegeven als alle opgegeven
 toetsen zijn ingedrukt wanneer de woordselectie verandert.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Alleen een popup weergeven als alle geselecteerde toetsen ingedrukt worden:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Alleen Ctrl-links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl-links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Alleen Shift-rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Shift-rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt-toets</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Ctrl-toets</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Alleen Alt-links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt-links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Shift-toets</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Alleen Alt-rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt-rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Alleen Ctrl-rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl-rechts</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Alleen Shift-links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Shift-links</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windowstoets of Metatoets</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3060,37 +3538,72 @@
 kunnen de toetsen ook kort erna ingedrukt worden.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Vertaald woord niet in popup weergeven maar naar hoofdvenster verzenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Vertaald woord naar hoofdvenster verzenden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Afspelen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Selecteer deze optie om lange artikelen automatisch samen te vouwen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Artikelen samenvouwen met meer dan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Langere artikelen automatisch samenvouwen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>tekens</translation>
     </message>
@@ -3125,27 +3638,27 @@
         <translation type="obsolete">Afspelen met Bass-audio bibliotheek</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Een extern programma gebruiken voor het afspelen van geluidsbestanden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Extern programma gebruiken:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Gea&amp;vanceerd</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Scan Popup-extra technologie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3156,12 +3669,12 @@
 programma&apos;s niet gebruikt, dan hoeft u dit niet te selecteren.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>&amp;IAccessibleEx gebruiken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3171,12 +3684,12 @@
 u dit niet te selecteren.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>&amp;UIAutomation gebruiken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3186,72 +3699,72 @@
 u dit niet te selecteren.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>&amp;GoldenDict methode gebruiken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Geschiedenis</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Schakel deze optie in om de geschiedenis van vertaalde woorden op te slaan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>&amp;Geschiedenis opslaan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Geef het maximum aantal items op dat bewaard wordt als geschiedenis.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Maximale grootte geschiedenis:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Opslag-interval voor geschiedenis (instellen op 0 om alleen op te slaan bij afsluiten).</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Elke</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minuten opslaan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artikelen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Schakel deze optie in om optionele onderdelen van artikelen altijd uit te vouwen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Optionele onderdelen &amp;uitvouwen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Toetsen ook achteraf in te drukken binnen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3260,32 +3773,32 @@
 een beperkt aantal hier op te geven seconden bewaakt.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>seconden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Sneltoetsen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>De volgende sneltoets gebruiken om het hoofdvenster te tonen of te verbergen:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>De volgende sneltoets gebruiken om woorden van het klembord te vertalen:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>De sneltoetsen werken systeembreed en vanuit elk programma zolang GoldenDict op de achtergrond actief is.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3298,78 +3811,78 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Opmerking: Waarschijnlijk gebruikt u een X.Org XServer versie, waarvan de RECORD-extensie niet functioneert. Daarom zullen sneltoetsen in Goldendict waarschijnlijk niet goed werken. Dit moet op de server zelf aangepast worden. U kunt naar het volgende verwijzen &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;foutvermelding&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; en daar een reactie achter laten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Geluid</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Uitspraak</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Woorden in hoofdvenster automatisch uitspreken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Woorden in Scan Popup automatisch uitspreken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Audiobestanden afspelen via FFmpeg(libav) en libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Interne speler gebruiken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Netwerk</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Schakel dit in om een proxyserver te gebruiken voor alle netwerkaanvragen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Proxyserver gebruiken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Poort:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Gebruiker:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3378,12 +3891,12 @@
 onjuist functioneert moet u dit mogelijk uitschakelen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Inhoud van andere sites blokkeren (verbergt de meeste reclame)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3393,24 +3906,24 @@
 kunnen gebruiken.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Web-invoegtoepassingen inschakelen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Sommige websites detecteren GoldenDict met behulp van HTTP-headers
 en blokkeren de aanvragen. Selecteer deze optie om dit te voorkomen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>GoldenDict niet identificeren in HTTP-headers</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3421,7 +3934,7 @@
 gevraagd een downloadpagina te openen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Periodiek controleren op nieuwe versies</translation>
     </message>
@@ -3429,27 +3942,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Tekst zonder opmaak</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Overeenkomst op voorvoegsel</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
@@ -3475,27 +3988,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Opdrachtregel</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Pictogram</translation>
     </message>
@@ -3503,12 +4016,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Fout bij laden artikel</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Fout bij decoderen artikel</translation>
     </message>
@@ -3619,18 +4134,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>FOUT: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Fout bij opslaan bron:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Kan de bron waarnaar wordt verwezen niet downloaden.</translation>
     </message>
@@ -3638,12 +4153,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji voor Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji voor Katakana</translation>
     </message>
@@ -3672,21 +4187,21 @@
         <translation type="obsolete">Treffer anzeigen (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Terug</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Vooruit</translation>
     </message>
@@ -3695,32 +4210,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Woord uitspreken (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Woord naar hoofdvenster verzenden (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Woordenboekwerkbalk weergeven of verbergen</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Hiermee vergrendelt u het venster zodat het zichtbaar blijft
@@ -3731,8 +4246,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3740,17 +4255,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Pad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Pictogram</translation>
     </message>
@@ -3758,45 +4273,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Tekst naar spraak</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(niet beschikbaar in de draagbare versie)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Kies een map</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Verwijderen bevestigen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>De map &lt;b&gt;%1&lt;/b&gt; uit de lijst verwijderen?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>De site &lt;b&gt;%1&lt;/b&gt; uit de lijst verwijderen?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Het programma &lt;b&gt;%1&lt;/b&gt; uit de lijst verwijderen?</translation>
     </message>
@@ -3815,7 +4332,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Toevoegen...</translation>
     </message>
@@ -3824,7 +4342,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Verwijderen</translation>
     </message>
@@ -3903,7 +4422,7 @@
         <translation type="obsolete">Alternativ kann %GD1251% für CP1251 und %GDISO1% für ISO 8859-1 benutzt werden.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programma&apos;s</translation>
     </message>
@@ -3913,27 +4432,27 @@
 Het zoekwoord wordt ook als standaardinvoer doorgegeven.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Live uitspraak van &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Deze site maakt het mogelijk om uitspraak van woorden op te nemen en te delen. U kunt er via GoldenDict naar luisteren.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Uitspraken van Forvo inschakelen</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API-sleutel:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3943,7 +4462,7 @@
 de site een eigen sleutel aan.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Uw eigen sleutel verkrijgt u &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;hier&lt;/a&gt;, of laat het veld leeg om de standaardsleutel te gebruiken.</translation>
     </message>
@@ -3973,80 +4492,90 @@
 %GDBIG5% voor Big-5, %GDBIG5HKSCS% voor Big5-HKSCS, %GDGBK% voor GBK en GB18030, %GDSHIFTJIS% voor Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Alle externe programma&apos;s. De tekenreeks %GDWORD% wordt automatisch vervangen door het zoekwoord.
 Als de tekenreeks niet aanwezig is, dan wordt het zoekwoord als standaardinvoer doorgegeven.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Taalcodes (komma-gescheiden):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Een lijst met taalcodes die u kunt gebruiken (voorbeeld: &quot;en, ru&quot;).</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>De volledige lijst met taalcodes is &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;hier&lt;/a&gt; beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteratie</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Russische transliteratie</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Griekse transliteratie</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Duitse transliteratie</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Wit-Russische transliteratie</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Het gebruik van het Latijnse alfabet inschakelen om de Japanse taal te schrijven</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japans Romaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Systemen:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>De meest gebruikte methode voor transcriptie van Japans,
 gebaseerd op Engelse klankleer</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4057,12 +4586,12 @@
 Nog niet geïmplementeerd in GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4073,32 +4602,32 @@
 Nog niet geïmplementeerd in GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Lettergrepenschrift:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Hiragana Japans syllabisch schrift</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Katakana Japans syllabisch schrift</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4228,22 +4757,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Pictogram</translation>
     </message>
@@ -4251,7 +4780,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Enkele woordenboeken konden niet doorzocht worden.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/pl_PL.ts goldendict-1.5.0~git20150923/locale/pl_PL.ts
--- goldendict-1.5.0~git20131003/locale/pl_PL.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/pl_PL.ts	2015-09-23 08:26:24.000000000 +0000
@@ -35,7 +35,7 @@
         <translation>[Nieznane]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Oparte na bibliotece  Qt %1 (%2, %3-bitowa)</translation>
     </message>
@@ -43,62 +43,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Rozwiń artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Zwiń artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Nie znaleziono tłumaczenia słowa &lt;b&gt;%1&lt;/b&gt; w grupie &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Nie znaleziono tłumaczenia w grupie &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Witamy!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Witamy w programie &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Aby rozpocząć pracę z programem, wybierz opcję &lt;b&gt;Edycja|Słowniki&lt;/b&gt; i dodaj ścieżki, w których wyszukiwane będą pliki słowników, skonfiguruj serwisy Wikipedii lub inne źródła, dostosuj słowniki oraz utwórz ich grupy.&lt;/p&gt;Po wykonaniu tych czynności program będzie gotowy do wyszukiwania słów! Można to robić w tym oknie za pomocą panelu znajdującego się po lewej stronie lub &lt;a href=&quot;Praca z okienkiem wyskakującym&quot;&gt;podczas pracy z innymi aplikacjami&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;W celu dostosowania programu wybierz opcję &lt;b&gt;Edycja|Preferencje&lt;/b&gt; i sprawdź dostępne preferencje. Do wszystkich preferencji wyświetlane są podpowiedzi. W razie wątpliwości należy je dokładnie przeczytać.&lt;/p&gt;&lt;p&gt;Jeśli potrzebujesz dodatkowej pomocy, masz pytania lub sugestie albo po prostu chcesz wiedzieć, co myślą inni, skorzystaj z naszego &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;. &lt;p&gt;Aktualizacje programu są dostępne &lt;a href=&quot;http://goldendict.org/&quot;&gt;w naszej witrynie sieci Web&lt;/a&gt;.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencja GPLv3 lub nowsza.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Praca z okienkiem wyskakującym</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Praca z okienkiem wyskakującym&lt;/h3&gt;Aby móc wyszukiwać słowa z innych działających aplikacji, aktywuj najpierw funkcję &lt;i&gt;„skanowania automatycznego”&lt;/i&gt; w opcji &lt;b&gt;Preferencje&lt;/b&gt; i w dowolnym momencie włącz ją, przełączając znajdującą się powyżej ikonę skanowania automatycznego lub klikając prawym przyciskiem myszy ikonę na pasku zadań i wybierając odpowiednią opcję z wyświetlonego menu. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Następnie zatrzymaj kursor w innej aplikacji nad słowem, które chcesz wyszukać. Spowoduje to wyświetlenie okienka wyskakującego zawierającego wyjaśnienie tego słowa.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Następnie zaznacz w innej aplikacji dowolne słowo za pomocą myszy (kliknij je dwukrotnie lub zaznacz wskaźnikiem myszy przy wciśniętym lewym przycisku). Spowoduje to wyświetlenie okienka wyskakującego zawierającego wyjaśnienie tego słowa.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(bez tytułu)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(obraz)</translation>
     </message>
@@ -106,37 +106,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Rozwiń artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Źródło: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Zwiń artykuł</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Błąd zapytania: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Podobne słowa: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Wyrażenia złożone: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Pojedyncze słowa: </translation>
     </message>
@@ -144,57 +144,57 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Wybierz aktualny artykuł</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Kopiuj jako tekst</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Zbadaj</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Zasób</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Głos TTS</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Obraz</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Wideo: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definicja ze słownika „%1”: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definicja: %1</translation>
     </message>
@@ -203,38 +203,39 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Wskazywany zasób nie istnieje.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Wskazywany program obsługi audio nie istnieje.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>BŁĄD: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Zapisz dźwięk</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Pliki dźwiękowe (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Zapisz obraz</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Pliki obrazów (*.bmp *.jpg *.png *.tif);;Wszystkie pliki (*.*)</translation>
     </message>
@@ -243,53 +244,53 @@
         <translation type="obsolete">Błąd zapisu zasobu: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Otwórz łącze</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>O&amp;twórz łącze w nowej karcie</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Otwórz łącze w z&amp;ewnętrznej przeglądarce</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Wyszukaj „%1”</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Wyszukaj „%1” w &amp;nowej karcie</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Wyślij „%1” do wiersza wejściowego</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>Dod&amp;aj „%1” do historii</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Wyszukaj „%1” w grupie %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Wyszukaj „%1” w grupie %2 w &amp;nowej karcie</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>OSTRZEŻENIE: Odtwarzacz audio FFmpeg: %1</translation>
     </message>
@@ -310,37 +311,37 @@
         <translation type="obsolete">Biblioteka BASS nie może odtworzyć tego dźwięku.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Nie powiodło się uruchomienie odtwarzacza w celu odtworzenia pliku dźwiękowego: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Nie powiodło się utworzenie pliku tymczasowego.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Nie powiodło się automatyczne otwarcie pliku zasobu. Spróbuj otworzyć ręcznie: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Nie powiodło się pobranie wskazywanego zasobu.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Zap&amp;isz obraz...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Zapisz &amp;dźwięk...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>OSTRZEŻENIE: %1</translation>
     </message>
@@ -350,42 +351,44 @@
         <translation>Formularz</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Znajdź:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Poprzednie</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Następne</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>Z rozróżnianiem wielkoś&amp;ci liter</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Podświetl &amp;wszystko</translation>
     </message>
@@ -411,6 +414,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>Wymagane uwierzytelnienie serwera proxy</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>Aby uzyskać dostęp za pośrednictwem serwera proxy, należy podać nazwę użytkownika i hasło</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>Nazwa użytkownika:</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>Hasło:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -511,6 +537,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>Tryb wyszukiwania</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>Ta opcja decyduje o sposobie interpretacji ciągu znaków filtru</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>Zaznaczenie tej opcji powoduje, że podczas filtrowania uwzględniana jest wielkość liter</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>Zgodna wielkość liter</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>Eksportuje hasła do pliku</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>Eksportuj</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>Kliknij ten przycisk, aby zastosować filtr do listy haseł</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>Zastosuj</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>Zaznaczenie tej opcji powoduje, że zmiany filtru są od razu stosowane do listy haseł</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>Stosuj automatycznie</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>Filtr:</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>Ciąg znaków filtru (ustalony ciąg znaków, symbole wieloznaczne lub wyrażenie regularne)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>Tekst</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>Symbole wieloznaczne</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>Wyrażenie regularne</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>Unikalne hasła łącznie: %1, przefiltrowane: %2</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>Zapisz hasła do pliku</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>Pliki tekstowe (*.txt);;Wszystkie pliki (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>Eksportuj hasła...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -553,6 +692,16 @@
         <translation>Opis:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>Pokaż wszystkie unikalne hasła słownika</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>Hasła</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -569,6 +718,76 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation>Adres URL:</translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation>Bazy danych:</translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation>Strategie wyszukiwania:</translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation>Włączone</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation>Nazwa</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation>Bazy danych</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation>Strategie</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>Rozdzielona przecinkami lista baz danych
+(pusty ciąg znaków lub „*” oznacza wszystkie bazy danych)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation>Rozdzielona przecinkami lista strategii wyszukiwania
+(pusty ciąg znaków oznacza strategię „prefiks”)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -590,17 +809,22 @@
         <translation>Edytuj tę grupę</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Informacje o słowniku</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>Hasła słownika</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Otwórz folder słownika</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Edytuj słownik</translation>
     </message>
@@ -608,39 +832,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>Ź&amp;ródła</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Słowniki</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupy</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Źródła uległy zmianie</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Niektóre źródła uległy zmianie. Czy zaakceptować zmiany?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -659,6 +883,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>Brak</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>Wyszukiwanie pełnotekstowe</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>Całe słowa</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>Zwykły tekst</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>Symbole wieloznaczne</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>Wyrażenie regularne</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>Maks. odstęp między słowami (%1–%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>Maks. liczba art. w słowniku (%1–%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>Znalezione artykuły: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>Trwa indeksowanie: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>Symbole CJK w ciągu znaków wyszukiwania nie są obsługiwane w trybach wyszukiwania „Całe słowa” i „Zwykły tekst”</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation>Wiersz wyszukiwania musi zawierać przynajmniej jedno słowo zawierające</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation>lub więcej symboli</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>Brak słowników do wyszukiwania pełnotekstowego</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>Brak</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -697,6 +1007,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>Szukaj</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>Zgodna wielkość liter</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>Tryb:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>Znalezione artykuły:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>Dostępne słowniki w grupie:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>Oczekują na indeksowanie:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>Łącznie:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>Zaindeksowane:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>Trwa indeksowanie: Brak</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -736,43 +1105,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>Karty grup</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>Otwórz listę grup</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Dodaj grupę</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Nadaj nazwę nowej grupie:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Zmień nazwę grupy</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Nadaj nową nazwę grupie:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Usuń grupę</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Czy na pewno usunąć grupę &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Usuń wszystkie grupy</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Czy na pewno usunąć wszystkie grupy?</translation>
     </message>
@@ -873,6 +1252,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation>Pomoc do programu GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation>Strona główna</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation>Wstecz</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation>Dalej</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation>Zwiększ</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation>Zmniejsz</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation>Normalna wielkość</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation>Spis treści</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation>Indeks</translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -903,12 +1330,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Propozycje:</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 - morfologia</translation>
     </message>
@@ -916,12 +1343,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
@@ -1961,7 +2388,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Błąd podczas ładowania słowników</translation>
     </message>
@@ -1969,7 +2396,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Błąd w pliku konfiguracyjnym. Czy kontynuować z ustawieniami domyślnymi?</translation>
     </message>
@@ -1985,18 +2412,18 @@
         <translation type="obsolete">Wyświetlaj małe ikony na paskach narzędzi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Pasek &amp;menu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Wyszukaj w:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Znaleziono w słownikach:</translation>
     </message>
@@ -2005,226 +2432,238 @@
         <translation type="obsolete">Nawigacja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Wstecz</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Dalej</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Skanowanie automatyczne</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Wymowa słowa (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Zwiększ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Zmniejsz</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Normalna wielkość</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Zwiększ słowa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Zmniejsz słowa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Normalna wielkość słów</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Wyświetl okno &amp;główne</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Zamknij bieżącą kartę</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Zamknij wszystkie karty</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Zamknij wszystkie karty z wyjątkiem bieżącej</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Nie włączono funkcji API dostępności</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artykuł, pełny (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artykuł, tylko HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Zapisywanie artykułu...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Okno główne będzie zawsze na wierzchu.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ukryj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Eksportowanie historii do pliku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Pliki tekstowe (*.txt);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Eksport historii został zakończony</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Błąd eksportu: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importowanie historii z pliku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Błąd importu: nieprawidłowe dane w pliku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Import historii został zakończony</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>&gt;Błąd importu: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Informacje o słowniku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>Hasła słownika</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Otwórz folder słownika</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Edytuj słownik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Zakończ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Ładowanie...</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Witamy!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>Słowniki: %1, artykuły: %2, słowa: %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Wyszukaj:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Wszystko</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Otwarte karty</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Pokaż nazwy w pas&amp;ku słowników</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Pokaż małe &amp;ikony w paskach narzędzi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nawigacja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>Ciągi znaków do wyszukiwania w słownikach. Dozwolone są symbole wieloznaczne „*”, „?” i zbiory symboli „[...]”.
+Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpowiednio ciągów „\*”, „\?”, „\[” i „\]”</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Lista otwartych kart</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(bez tytułu)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2237,57 +2676,57 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Nie powiodło się zainicjowanie mechanizmu monitorowania klawiszy skrótu.&lt;br&gt;Upewnij się, że włączono rozszerzenie RECORD serwera XServer.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Dostępna jest nowa wersja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Wersja &lt;b&gt;%1&lt;/b&gt; programu GoldenDict jest dostępna do pobrania.&lt;br&gt;Kliknij przycisk &lt;b&gt;Pobierz&lt;/b&gt;, aby przejść do strony pobierania.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Pomiń tę wersję</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Wybrano opcję ukrycia paska menu. Użyj %1, aby ponownie wyświetlić.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Ustawienia strony</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Drukarka jest niedostępna. Trzeba ją najpierw zainstalować.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Drukuj artykuł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Zapisz artykuł jako</translation>
     </message>
@@ -2296,42 +2735,42 @@
         <translation type="obsolete">Pliki html (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Nie można zapisać artykułu: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edycja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>Po&amp;moc</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>Po&amp;większenie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historia</translation>
     </message>
@@ -2340,12 +2779,12 @@
         <translation type="obsolete">Okienko wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Słowniki...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
@@ -2358,17 +2797,17 @@
         <translation type="obsolete">Okienko nawigacji po wynikach</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Okienko wy&amp;szukiwania</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Okienko nawigacji po wynikach</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Okienko &amp;historii</translation>
     </message>
@@ -2377,133 +2816,163 @@
         <translation type="obsolete">&amp;Słowniki...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>Wy&amp;szukiwanie</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferencje...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Strona główna</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Informacje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Informacje o programie GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation>Pomoc do programu GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Zakończ aplikację</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>Z&amp;amknij do paska zadań</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimalizuje okno do paska zadań</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>Zapi&amp;sz artykuł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Zapisz artykuł</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Drukuj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Ustawienia strony</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>&amp;Podgląd wydruku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Wczytaj pliki ponownie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nowa karta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Zawsze na wierzchu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Zawsze na wierzchu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Przycisk menu</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>Szukaj na stronie</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>Wyszukiwanie pełnotekstowe</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Podgląd wydruku</translation>
     </message>
@@ -2512,48 +2981,48 @@
         <translation type="obsolete">Wczytaj pliki ponownie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>Wy&amp;czyść</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nowa karta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Folder &amp;konfiguracji</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Pokaż</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksportuj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importuj</translation>
     </message>
@@ -2561,12 +3030,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Plik słownika został zmodyfikowany lub uszkodzony</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Nie można załadować artykułu ze źródła %1, przyczyna: %2</translation>
     </message>
@@ -2574,7 +3043,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Błąd podczas analizy pliku XML: %1 w %2,%3</translation>
     </message>
@@ -2582,7 +3051,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Błąd podczas analizy pliku XML: %1 w %2,%3</translation>
     </message>
@@ -2590,22 +3059,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -2618,88 +3087,94 @@
         <translation>Formularz</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Kolejność słowników:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Słowniki nieaktywne (wyłączone):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informacje o słowniku</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Łączna liczba artykułów:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Łączna liczba słów:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Tłumaczenia z:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Tłumaczenia na:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Pliki składające się na ten słownik:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Dostosuj kolejność, przeciągając i upuszczając elementy. Upuszczenie słownika w grupie nieaktywnych powoduje jego wyłączenie.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Sortuj wg nazwy</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Sortuj wg języków</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>Hasła słownika</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation>Słowniki aktywne: %1, nieaktywne: %2</translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Ścieżka</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Uwzględniaj podkatalogi</translation>
     </message>
@@ -2707,37 +3182,38 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Domyślny systemu</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Domyślny</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Nowoczesny</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes niebieski</translation>
     </message>
@@ -2746,12 +3222,12 @@
         <translation type="obsolete">Odtwarzaj w DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Zmiana języka</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Uruchom ponownie program, aby zastosować zmianę języka.</translation>
     </message>
@@ -2853,12 +3329,12 @@
         <translation>Styl wyświetlania:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Skanowanie automatyczne</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2869,7 +3345,7 @@
 głównego lub z paska zadań.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Włącz funkcję skanowania automatycznego</translation>
     </message>
@@ -2926,141 +3402,146 @@
         <translation>Styl dodatku:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation>Język pomocy</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Dostosuj tę wartość, aby uniknąć zbyt dużych menu kontekstowych.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Limit słowników w menu kontekstowym:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Wskazuje, czy tryb skanowania automatycznego jest domyślnie włączony, czy nie. Zaznaczenie
 tej opcji powoduje, że program uruchamia się z włączonym skanowaniem automatycznym.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Uruchamiaj z włączoną funkcją skanowania automatycznego</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Włączenie tej opcji powoduje, że okienko wyskakujące jest wyświetlane tylko wtedy,
 kiedy zaznaczenie słowa ulega zmianie przy naciśniętych wszystkich wybranych klawiszach.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Wyświetlaj okienko wyskakujące tylko po naciśnięciu wszystkich wybranych klawiszy:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Tylko lewy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Lewy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Tylko prawy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Prawy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Klawisz Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Klawisz Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Tylko lewy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Lewy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Klawisz Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Tylko prawy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Prawy Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Tylko prawy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Prawy Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Tylko lewy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Lewy Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Klawisz Windows/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3070,37 +3551,72 @@
 że wybrane klawisze można nacisnąć krótko po zaznaczeniu słowa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Wyślij przetłumaczone słowo do okna głównego, a nie wyświetlaj w okienku wyskakującym</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Wyślij przetłumaczone słowo do okna głównego</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Odtwarzanie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>Systemowy serwer proxy</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>Niestandardowy serwer proxy</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>Ustawienia niestandardowe</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>Wyszukiwanie pełnotekstowe</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>Zezwalaj na wyszukiwanie pełnotekstowe w źródłach:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>Nie wyszukuj w słownikach, w których liczba artykułów przekracza</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>(0 — bez ograniczenia)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Zaznacz tę opcję, aby automatycznie zwijać duże artykuły</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Zwijaj artykuły większe niż</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Artykuły o długości przekraczającej tę wartość będą zwijane</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>symboli</translation>
     </message>
@@ -3133,27 +3649,27 @@
         <translation type="obsolete">Odtwarzaj za pomocą biblioteki BASS</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Używaj zewnętrznego programu do odtwarzania plików dźwiękowych</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Używaj programu zewnętrznego:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Zaawansowane</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Dodatkowe technologie skanowania automatycznego</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3164,12 +3680,12 @@
 Nie ma potrzeby włączania tej opcji, gdy takie programy nie są używane.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Używaj &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3178,12 +3694,12 @@
 Nie ma potrzeby włączania tej opcji, gdy takie programy nie są używane.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Używaj &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3192,72 +3708,72 @@
 Nie ma potrzeby włączania tej opcji, gdy takie programy nie są używane.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Używaj komunikatu programu &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Włącz tę opcję, aby zapisywać historię tłumaczonych słów</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Zapisuj &amp;historię</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Określ maksymalną liczbę słów przechowywanych w historii</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Maksymalna wielkość historii:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Interwał zapisywania historii. Wartość zero oznacza, że historia jest zapisywana tylko przy wychodzeniu z programu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Zapisuj co</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artykuły</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Włącz tę opcję, aby zawsze rozwijać opcjonalne części artykułów</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Rozwijaj części o&amp;pcjonalne</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Klawisze można nacisnąć nie więcej niż</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3265,32 +3781,32 @@
 tylko przez podaną tutaj liczbę sekund po zaznaczeniu słowa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>sek. później</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>&amp;Klawisze skrótu</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Używaj tego klawisza skrótu do wyświetlenia lub ukrycia okna głównego:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Używaj tego klawisza skrótu do przetłumaczenia słowa znajdującego się w schowku:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Te klawisze skrótu są globalne i działają w każdym kontekście każdego programu, o ile tylko program GoldenDict działa w tle.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3303,79 +3819,79 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Uwaga: prawdopodobnie w tym systemie działa wersja serwera XServer X.Org z uszkodzonym rozszerzeniem  RECORD. Klawisze skrótu w programie GoldenDict prawdopodobnie nie będą funkcjonować. Należy to naprawić w samym serwerze. Zapoznaj się z następującym &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;opisem błędu&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; i jeśli chcesz, dopisz swój komentarz.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Dźwięk</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Wymowa</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Automatycznie wymawiaj słowa znajdujące się w oknie głównym</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Automatycznie wymawiaj słowa znajdujące się w okienku wyskakującym</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Odtwarzaj pliki audio za pomocą FFmpeg(libav) i libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Używaj odtwarzacza wewnętrznego</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>Si&amp;eć</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Włącz, aby używać serwera proxy we wszystkich
 żądaniach sieciowych programu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Używaj serwera proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Użytkownik:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3385,12 +3901,12 @@
 niedziałania niektórych witryn.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Nie zezwalaj na wyświetlanie treści pochodzących z innych witryn (ukrywa większość reklam)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3399,24 +3915,24 @@
 Działanie tej opcji wymaga zainstalowania odpowiedniej wtyczki.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Włącz wtyczki internetowe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Niektóre witryny wykrywają program GoldenDict za pomocą nagłówków HTTP i blokują żądania.
 Włącz tę opcję, aby obejść ten problem.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Nie identyfikuj programu GoldenDict w nagłówkach HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3429,7 +3945,7 @@
 otwarcia strony pobierania.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Sprawdzaj okresowo dostępność nowej wersji programu</translation>
     </message>
@@ -3437,27 +3953,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Zwykły tekst</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Zgodność przedrostków</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Nieznane</translation>
     </message>
@@ -3483,27 +3999,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Wiersz komend</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -3511,12 +4027,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Błąd ładowania artykułu</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Błąd dekodowania artykułu</translation>
     </message>
@@ -3627,18 +4145,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>BŁĄD: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Błąd zapisu zasobu: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Nie powiodło się pobranie wskazywanego zasobu.</translation>
     </message>
@@ -3646,12 +4164,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji dla Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji dla Katakana</translation>
     </message>
@@ -3680,21 +4198,21 @@
         <translation type="obsolete">Pokaż znalezione (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Wstecz</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Dalej</translation>
     </message>
@@ -3703,32 +4221,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Wymowa słowa (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Wyślij słowo do okna głównego (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Wyświetla lub ukrywa pasek słowników</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Opcja ta umożliwia przypięcie okna na stałe do ekranu. Dzięki
@@ -3739,8 +4257,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1– %2</translation>
     </message>
@@ -3748,17 +4266,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Ścieżka</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -3766,45 +4284,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Tekst na mowę</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(niedostępne w wersji przenośnej)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Wybierz katalog</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Potwierdzenie usunięcia</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Czy usunąć katalog &lt;b&gt;%1&lt;/b&gt; z listy?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Czy usunąć witrynę &lt;b&gt;%1&lt;/b&gt; z listy?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Czy usunąć program &lt;b&gt;%1&lt;/b&gt; z listy?</translation>
     </message>
@@ -3823,7 +4343,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Dodaj...</translation>
     </message>
@@ -3832,7 +4353,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Usuń</translation>
     </message>
@@ -3912,7 +4434,7 @@
         <translation type="obsolete">Można też użyć ciągu znaków %GD1251% dla słów w stronie kodowej CP1251 lub ciągu znaków %GDISO1% dla słów w stronie kodowej ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programy</translation>
     </message>
@@ -3921,27 +4443,27 @@
         <translation type="obsolete">Wszystkie programy zewnętrzne. Ciąg znaków %GDWORD% zostaje zastąpiony wyszukiwanym słowem. To słowo zostaje także umieszczone w standardowym wejściu.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Rzeczywista wymowa z witryny &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Witryna ta umożliwia rejestrowanie i udostępnianie wzorów wymowy słów. Można z nich korzystać w programie GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Włącz dostęp do wymowy w witrynie Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Klucz API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3950,7 +4472,7 @@
 dostępny, lub zarejestruj się w tej witrynie, aby uzyskać własny klucz API.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Uzyskaj własny klucz &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;tutaj&lt;/a&gt; lub pozostaw puste pole, aby użyć klucza domyślnego.</translation>
     </message>
@@ -3980,79 +4502,89 @@
 %GDBIG5% dla Big-5, %GDBIG5HKSCS% dla Big5-HKSCS, %GDGBK% dla GBK i GB18030, %GDSHIFTJIS% dla Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation>Serwery DICT</translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation>Serwery DICT:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Dowolne programy zewnętrzne. Ciąg znaków %GDWORD% zostanie zastąpiony wyszukiwanym słowem. Przy braku tego ciągu znaków, słowo zostanie przesłane do standardowego wejścia.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Kody języków (rozdzielone przecinkami):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista wybranych kodów języków. Na przykład: „en, ru, pl”.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Pełna lista kodów języków jest dostępna &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;tutaj&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteracja</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Transliteracja rosyjska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Transliteracja grecka</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Transliteracja niemiecka</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Transliteracja białoruska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Umożliwia pisanie w języku japońskim za pomocą alfabetu łacińskiego</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japońskie Rōmaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Systemy:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Najczęściej używana metoda transkrypcji języka japońskiego
 oparta na wymowie angielskiej</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4063,12 +4595,12 @@
 Systemu tego nie zaimplementowano jeszcze w programie GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4080,32 +4612,32 @@
 Systemu tego nie zaimplementowano jeszcze w programie GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Zapisy sylabiczne:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Japoński zapis sylabiczny Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Japoński zapis sylabiczny Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4235,22 +4767,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -4258,7 +4790,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Nie powiodło się przeszukanie niektórych słowników.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/pt_BR.ts goldendict-1.5.0~git20150923/locale/pt_BR.ts
--- goldendict-1.5.0~git20131003/locale/pt_BR.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/pt_BR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Desconhecido]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Baseado no Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,63 +42,63 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Expandir artigo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Recolher artigo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Não achei nenhuma definição ou tradução da palavra/expressão &lt;b&gt;%1&lt;/b&gt; no grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Não achei a palavra no grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Bem-vindo!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Bem vindo ao &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Para começar a trabalhar com o programa, primeiro visite &lt;b&gt;Editar|Dicionários&lt;/b&gt; para adicionar alguns caminhos de diretório, onde procuram os arquivos de dicionários, configurar vários sites da Wikipedia ou outras fontes, ajustar a ordem de dicionário ou criar grupos de dicionários.&lt;p&gt;E então você estará pronto para visualizar suas palavras! Você pode fazer isso nesta janela usando o painel à esquerda, ou você pode &lt;a href=&quot;Trabalhando com pop-up&quot;&gt;procurar palavras a partir de outras aplicações ativas&lt;/a&gt;. &lt;p&gt;Para personalizar o programa, confira as preferências disponíveis no &lt;b&gt;Editar|Preferências&lt;/b&gt;. Todas as configurações tem dicas, não deixe de lê-las, se você estiver em dúvida sobre qualquer coisa.&lt;p&gt;Se você precisar de mais ajuda, têm qualquer dúvida, sugestões ou apenas saber o que os outros pensam, você é bem-vindo ao programa de &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Confira o programa do &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; para atualizações. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licenciado sob GPLv3 ou posterior.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Trabalhando com janelas de definições/tradução semiautomáticas</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Trabalhando com janelas de definições/tradução semiautomáticas&lt;/h3&gt;Para fazer consultas/tradução de palavras da janela de outros aplicativos abertos, primeiramente é necessário habilitar a função de janelas secundárias seguindo estes passos a partir da janela principal:&lt;p&gt;&lt;OL&gt;&lt;LI&gt;Clique em &lt;b&gt;Editar|Configurar&lt;/b&gt;;
 &lt;LI&gt;Clique na guia &lt;b&gt;&lt;i&gt;&quot;Janela de Definições Semiautomáticas&quot;&lt;/b&gt;&lt;/i&gt;;&lt;LI&gt;Marque a opção &lt;i&gt;&quot;Ativar funcionalidades de janelas secundárias de definições semiautomáticas&quot;&lt;/i&gt;;&lt;LI&gt;Em seguida, clique em &quot;OK&quot; para salvar as configurações.&lt;/OL&gt;&lt;p&gt;Com esta opção ativada, você pode marcar ou desmarcar a exibição das janelas secundárias quando quiser. Para fazê-lo, há duas formas:&lt;UL&gt;&lt;LI&gt;Na janela principal, clique no botão de &lt;b&gt;Definições Semiautomáticas&lt;/b&gt;, cujo botão assemelha-se a uma varinha;&lt;LI&gt;No ícone do programa exibido na Área de Notificação (perto do relógio), clique com o botão direito do mouse e marque a opção &lt;b&gt;&lt;i&gt;Definições Semiautomáticas&lt;/b&gt;&lt;/i&gt;.&lt;/UL&gt;&lt;p&gt;Uma vez habilitada esta função, qualquer palavra ou expressão selecionada terá suas definições exibidas (se a palavra/expressão da consulta existir em algum dos dicionários especificados na configuração) imediatamente nos resultados da consulta. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Basta pairar o ponteiro do mouse sobre a palavra/expressão exibida em uma janela qualquer e que desejar consultar que será exibida uma janela com as definições/tradução.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Com isso, você pode consultar ou traduzir palavra/expressão da janela de qualquer programa que seja selecionável ou em que se possa clicar duplamente. Alás, um clique duplo do mouse, por exemplo, seleciona uma palavra, ao passo que um clique triplo, uma frase inteira.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(sem título)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(imagem)</translation>
     </message>
@@ -106,37 +106,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Expandir artigo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Resultados de </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Recolher artigo</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Erro de Consulta: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Palavras semelhantes: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Termos compostos: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Palavras independentes: </translation>
     </message>
@@ -149,219 +149,222 @@
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>sobre:branco</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Localizar:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>A&amp;nterior</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Próxima</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Diferenciar maiúsculas/minúsculas</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Destacar &amp;tudo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Fonte de Dados</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Voz TTS</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Imagem</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Vídeo: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definição do dicionário &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definição: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>A fonte de dados procurada não existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>O programa de áudio especificado não existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Salvar som</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Arquivos de som (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Salvar imagem</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Arquivos de imagem (*.bmp *.jpg *.png *.tif);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>Abrir Ligação (&amp;O)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Abrir Ligação em Nova Guia (&amp;G)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Abrir Ligação em &amp;Navegador da Web Externo </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Salvar &amp;imagem...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Salvar S&amp;om...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Procurar &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Exibir resultado de &quot;%1&quot; em &amp;nova guia</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Enviar &quot;%1&quot; para o campo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Adicionar &quot;%1&quot; ao histórico</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Procurar «%1» em %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Exibir o resultado da consulta de &quot;%1&quot; no %2 em &amp;nova aba</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>AVISO: Player de Áudio FFmpeg: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Não foi possível executar o reprodutor de áudio: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Não foi possível criar o arquivo temporário.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Não foi possível abrir a fonte de dados automaticamente. Tente abri-la manualmente: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ATENÇÃO: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Selecionar o Artigo Atual</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Copiar como texto</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspecionar</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Não foi possível efetuar o download do arquivo de fontes de dados.</translation>
     </message>
@@ -387,6 +390,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Senha:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -487,6 +513,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Arquivos de texto (*.txt);;Todos os arquivos (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -529,6 +668,16 @@
         <translation>Descrição:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -545,6 +694,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Endereço</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Ícone</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -562,17 +779,22 @@
         <translation>Editar este grupo</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Informs. do Dicionário</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Abrir pasta de dicionário</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Editar dicionário</translation>
     </message>
@@ -585,39 +807,39 @@
         <translation>Dicionários</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Fontes</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Dicionários</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Fontes modificadas</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Algumas fontes de dados foram modificadas. Devo aceitar as modificações?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -631,6 +853,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Nenhum</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Nenhum</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -669,6 +977,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -799,7 +1166,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Re&amp;mover todos</translation>
     </message>
@@ -809,42 +1176,100 @@
         <translation>Arraste e solte os &amp;dicionários nos grupos, organize-os e reordene-os com o ponteiro do mouse.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Adicionar grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Digite o nome do grupo que deseja criar:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Renomear grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Digite o novo nome do grupo:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Remover grupo</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Tem certeza de que quer remover o grupo &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Tem certeza de que quer remover todos os grupos?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Aumentar as letras das definições</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Diminuir as letras das definições</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Restaurar as letras das definições</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -875,12 +1300,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Sugestões ortográficas: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Ortografia de %1</translation>
     </message>
@@ -888,12 +1313,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -1933,7 +2358,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Erro ao carregar dicionários</translation>
     </message>
@@ -1941,7 +2366,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Erro no arquivo de configuração. Continuar com as configurações padrão?</translation>
     </message>
@@ -1950,534 +2375,575 @@
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Bem-vindo!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>Aj&amp;uda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>Exi&amp;bir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zoom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>His&amp;tórico</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Painel de Pesquisa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Painel de Navegação Resultados</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp; Painel Histórico</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Dicionários...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Configurar...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Site do programa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>S&amp;obre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Sobre o GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Fechar o GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Fechar o programa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Fórum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Pôr na Área de Notificação</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimiza a janela como ícone na Área de Notificação</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Salvar verbete</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Salva o verbete atual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Configurar Impressão</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Pré-&amp;visualizar Impressão</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Re-escanear Arquivos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nova Aba</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Sempre no Topo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Sempre no Topo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Botão Menu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nova guia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Pasta de &amp;configuração</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>E&amp;xibir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Barra de &amp;Menus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Procurar em:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Achado nos dicionários:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Seguinte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Definição Semiautomática</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronuncia a palavra da consulta atual (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Aumentar as letras das definições</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Diminuir as letras das definições</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Restaurar as letras das definições</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Aumentar as letras dos verbetes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Diminuir as letras dos verbetes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Restaurar as letras dos verbetes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>&amp;Mostrar a janela principal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Fechar a guia atual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Fechar todas as guias</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Fechar todas as guias com exceção da atual</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Carregando...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 dicionário, %2 verbetes, %3 palavras</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Procurar:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Todos os Dicionários</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Guias abertas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Mostrar Nomes na &amp;Barra de Dicionário</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Exibir Ícones Pequenos na &amp;Barra de Tarefas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navegação</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Abrir a lista de guias</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(sem título)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Não foi possível acionar o mecanismo de monitoramento por atalho.&lt;br&gt;Veja se seu XServer está com a extensão RECORD ativada.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Nova Versão Disponível</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>A versão &lt;b&gt;%1&lt;/b&gt; do GoldenDict está disponível para download.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Baixar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Ignorar esta versão</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Acessibilidade a API não está habilitada</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Você optou por ocultar a barra de menus. Use %1 para exibi-la de novo.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Configuração de Página</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Não achei nenhuma impressora. Favor instalar uma.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Imprimir Verbete</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artigo, Completo (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artigo, Apenas HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Salvar Verbete como</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Erro!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Não foi possível salvar o verbete: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Salvando artigo...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>A janela principal está definida para estar sempre no topo.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ocultar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Exportar o histórico</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Arquivos de texto (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Feita a exportação do histórico</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Erro de exportação:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importar histórico de arquivo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Erro ao tentar importar: dados inválidos no arquivo.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Feita a importação do histórico.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Erro de importação:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Inform. do Dicionário</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Abrir pasta de dicionário</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Editar dicionário</translation>
     </message>
@@ -2485,12 +2951,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Arquivo dicionário foi adulterado ou corrompido</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Falha ao carregar artigo de %1, motivo: %2</translation>
     </message>
@@ -2498,7 +2964,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Erro de análise sintática de XML: %1 em %2,%3</translation>
     </message>
@@ -2506,7 +2972,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Erro de análise sintática de XML: %1 em %2,%3</translation>
     </message>
@@ -2514,22 +2980,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ícone</translation>
     </message>
@@ -2542,89 +3008,95 @@
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Ordem dos dicionários:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Dicionários desativados:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informações sobre dicionários</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Total de verbetes:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Total de palavras:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Traduz do:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Para o:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Arquivos deste dicionário:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Para ordenar os dicionários, arraste-os como desejar.
 Se quiser desativar dicionários, arraste-os para o grupo de desativados.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Organizar por nome</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Organizar por idiomas</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Caminho</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Buscar em subpastas</translation>
     </message>
@@ -2790,22 +3262,27 @@
         <translation>Tipo de add-on:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Ajustar este valor para evitar menus de contexto enormes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Limite de dicionários no menu de contexto:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Janela de Definições/Tradução Semiautomáticas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2817,135 +3294,135 @@
 programa na Área de Notificação.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Habilitar funcionalidades de janela de definições/tradução semiautomáticas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Permite especificar se a janela secundária de definições/tradução semiautomáticas deve ficar ativa por padrão. Se habilitada esta opção, o programa será sempre executado com a janela secundária ativada.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Executar o GoldenDict com a janela de definições/tradução semiautomáticas habilitada</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Se habilitada esta opção, a janela de definições/tradução só aparecerá se todas as
 teclas do atalho estiverem premidas quando a seleção de palavra mudar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Só exibir a janela de definições/tradução semiautomática se o usuário premer as teclas escolhidas abaixo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Ctrl esquerda apenas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl esquerda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Shift direita apenas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Shift direita</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tecla Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tecla Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Alt esquerda apenas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt esquerda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tecla Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Alt direita apenas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt direita</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Ctrl direita apenas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl direita</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Shift esquerda apenas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Shift esquerda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tecla Windows ou Tecla Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Windows/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2955,12 +3432,12 @@
 teclas de atalho podem ser premidas também pouco depois da seleção da palavra/expressão.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Permitir que as teclas sejam premidas depois também, após...</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2969,44 +3446,44 @@
 dentro do limite de tempo especificado aqui.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Envia a palavra traduzida/consultada para a janela principal,
 em vez de exibi-la numa janela secundária (popup).</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Enviar a palavra traduzida/consultada para a janela principal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Atalhos de Teclado</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Usar o seguinte atalho de teclado para mostrar/ocultar a janela principal:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Usar o seguinte atalho de teclado para consultar nos dicionários ou traduzir texto da Área de Transferência:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Os atalhos de teclado são globais e funcionam a partir de qualquer programa,
 em qualquer situação ou contexto, desde que o GoldenDict esteja em execução.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3019,114 +3496,149 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Nota: Parece que você está executando uma versão do X.Org XServer com a extensão RECORD quebrada. Os atalhos de teclado talvez não funcionem no GoldenDict. Isso deve ser consertado no próprio servidor. Veja a documentação no site: &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;sugli errori &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; e deixe um comentário lá, se quiser.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Áudio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Pronúncia</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Pronunciar palavras na janela principal automaticamente</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Pronunciar automaticamente palavras da janela de definições/tradução semiautomáticas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Reprodução</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Reproduzir arquivos de áudio via FFmpeg(libav) e libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Usar player interno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Selecione essa opção para automaticamente recolher grandes artigos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Recolher artigos mais de</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Artigos mais longos que esse tamanho vai ser recolhido</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>símbolos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Usa um aplicativo externo para reproduzir arquivos de áudio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Usar programa externo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Rede</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Habilite esta opção para usar um servidor proxy
 para todos os acessos à rede pelo programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Usar servidor proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Porta:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Usuário:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3136,12 +3648,12 @@
 para ver se o problema é solucionado.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Não permitir o carregamento de conteúdo de outros sites (oculta a maioria das propagandas)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3150,24 +3662,24 @@
 O plugin precisa estar instalado em seu sistema para isto funcionar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Habilitar plugins da web</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Alguns sites detectam GoldenDick via cabeçalhos HTTP e bloqueiam as solicitações.
 Ative essa opção para solucionar o problema.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Não identificar GoldenDict nos cabeçalhos HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3178,22 +3690,22 @@
 e pergunta se ele deseja visitar a página de download.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Procurar atualizações do programa periodicamente</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>A&amp;vançada</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Tecnologias exibição de definições/tradução semiautomáticas extras</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3204,12 +3716,12 @@
 Não é necessário habilitar esta opção se você não usa programas desse tipo.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Usar &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3218,12 +3730,12 @@
 Não é necessário habilitar esta opção se você não usa esses tipos de programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Usar &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3232,107 +3744,108 @@
 Não é necessário habilitar esta opção se você não usa esses tipos de programas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Usar o comando especial de consulta do &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Histórico</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Habilite esta opção se quiser gravar o histórico das palavras traduzidas/pesquisadas.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Gravar o &amp;histórico</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Especifique o número máximo de entradas para manter no histórico.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Tamanho máximo do histórico:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervalo ao salvar o histórico. Se definido histórico como 0, será salvo apenas durante a saída.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Salvar tudo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artigos</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Habilite esta opção se quise expandir sempre partes opcionais de artigos.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>E&amp;xpandir partes opcionais</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Padrão do sistema</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Moderno</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Modificando Idioma</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Reinicie o programa para aplicar a mudança de idioma.</translation>
     </message>
@@ -3340,27 +3853,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Texto simples</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Correspondência de prefixo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
@@ -3386,27 +3899,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Habilitada</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Linha de comando</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ícone</translation>
     </message>
@@ -3414,12 +3927,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Erro ao carregar Artigo</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Erro ao decodificar Artigo</translation>
     </message>
@@ -3530,18 +4045,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Erro ao salvar recurso:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>O recurso referenciado não conseguiu baixar.</translation>
     </message>
@@ -3549,12 +4064,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji para Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji para Katakana</translation>
     </message>
@@ -3575,59 +4090,59 @@
         <translation>Painel</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Para Frente</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Pronunciar a palavra da consulta atual (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Enviar palavra para a janela principal (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Mostra ou oculta a barra de dicionários</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Use esta opção para fixar a janela do GoldenDict na frente
 das outras janelas, redimensioná-la ou geri-la à vontade.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3635,17 +4150,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Caminho</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ícone</translation>
     </message>
@@ -3667,7 +4182,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Adicionar...</translation>
     </message>
@@ -3676,7 +4192,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Remover</translation>
     </message>
@@ -3753,32 +4270,32 @@
         <translation>Especifique qualquer site que desejar. O demarcador %GDWORD% será substituído pela palavra da consulta do usuário:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programas</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Pronunciar palavras diretamente de &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Este site permite gravar e compartilhar pronúncias de palavras. É possível ouvi-las no GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Habilitar pronúncias do Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Chave API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3788,7 +4305,7 @@
 obter sua própria chave.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Obter sua própria chave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;aqui&lt;/a&gt;, ou deixe em branco para usar o padrão.</translation>
     </message>
@@ -3800,80 +4317,90 @@
 %GDBIG5% por Big-5, %GDBIG5HKSCS% por Big5-HKSCS, %GDGBK% por GBK e GB18030, %GDSHIFTJIS% por Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Todos os programas externos. Um texto %GDWORD% vai ser substituído com a palavra consultada. Se nenhum texto não é apresentado, a palavra vai ser alimentada com a entrada padrão.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Códigos de idioma
 (separar por vírgula):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista de códigos de idioma que você gostaria de ter. Por exemplo: &quot;en, ru, pt_BR&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>A lista completa de códigos de idioma está disponível &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;aqui&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliteração</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Transliteração do Russo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Transliteração do Grego</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Transliteração do Alemão</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Bielorrusso transliteração</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Habilita a romanização do japonês (palavras japonesas escritas em Latim)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonês Romanizado (ideogramas convertidos para caracteres latinos)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemas:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>O método de transcrição japonesa mais amplamente
 usado, baseado na fonologia inglesa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Romanização hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3885,12 +4412,12 @@
 Ainda não implementado no GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3901,75 +4428,77 @@
 Ainda não implementado no GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Silabários:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Silabário japonês Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Silabário japonês Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Texto para Fala</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(indisponível na versão portátil)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Escolha uma pasta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Confirmar remoção</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Quer mesmo remover a pasta &lt;b&gt;%1&lt;/b&gt; da lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Quer mesmo remover o site &lt;b&gt;%1&lt;/b&gt; da lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Quer mesmo remover o programa &lt;b&gt;%1&lt;/b&gt; da lista?</translation>
     </message>
@@ -4099,22 +4628,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ícone</translation>
     </message>
@@ -4122,7 +4651,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Não foi possível consultar alguns dicionários.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/qu_WI.ts goldendict-1.5.0~git20150923/locale/qu_WI.ts
--- goldendict-1.5.0~git20131003/locale/qu_WI.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/qu_WI.ts	2015-09-23 08:26:24.000000000 +0000
@@ -49,7 +49,7 @@
         <translation>[mana yachasqachu]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -57,62 +57,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Mana &lt;b&gt;%2&lt;/b&gt; juñupi &lt;b&gt;%1&lt;/b&gt; simita tarinchu.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Mana &lt;b&gt;%1&lt;/b&gt; juñupi simita tarinchu.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Qallarinapaq</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;¡Bienvenido a &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Qallarinapaq, &lt;b&gt;Allinchay &gt; Simi-pirwakuna&lt;/b&gt; riy. Jaqaypi simi-pirwakunata mask&apos;anapaq ñankunata yapay. Chaymanta, simi-pirwakunata ñiqichayta atinki. Juñukunaman simi-pirwakunata yapayta atinkitaq. &lt;p&gt;Chaymantari, simikunapi simikunata atinki. Mask&apos;anapaq tawak&apos;uchupi simita qillqapay. Wak programakunapi simikunata mask&apos;anapaq, &lt;a href=&quot;Working with popup&quot;&gt;Juch&apos;uy qhawanapi mask&apos;ayta&lt;/a&gt; qhaway. &lt;p&gt;Kay programata kamachinapaq &lt;b&gt;Allinchay &amp;gt; Aqllanakuna&lt;/b&gt; menuman riy. Achkhata yachanapaq qqllanakunaqpa willaynkukunata nawichayta atinki. &lt;p&gt;Aswan yanapata munaspaqa, &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;GoldenDictpa foronpi&lt;/a&gt; tapuyta atinki. Kay programata kunanchanapaq &lt;p&gt;&lt;a href=&quot;http://goldendict.org/&quot;&gt;web raphiman&lt;/a&gt; riy. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. GoldenDictqa GPL kamachiyyuq, versión 3 qhipamantataq.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Juch&apos;uy qhawanapi mask&apos;anapaq</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Cómo Utilizar la ventana emergente&lt;/h3&gt;Para buscar palabras desde otras aplicaciones activas, primero hay que habilitar la opción &lt;i&gt;&quot;Escaneo en una ventana emergente&quot;&lt;/i&gt; en &lt;b&gt;Editar|Preferencias&lt;/b&gt;. Luego puede utilizarla en cualquier momento, activando el icono arriba de la &apos;Ventana Emergente&apos;. Alternativamente, haga clic a derecha abajo en la bandeja del sistema y seleccione la opción &lt;b&gt;Escanear con Ventana Emergente&lt;/b&gt; en el menú.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Luego detenga el cursor sobre la palabra que Ud. quiere buscar en otra aplicación y una ventana emergente aparecerá para hacer la consulta.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Luego, seleccione una palabra deseada con su ratón para buscarla desde otra aplicación. Para seleccionar una palabra haga doble clic o arrastra sobre la palabra mientras oprimiendo el botón del ratón, y una ventana emergente aparecerá con la definición de la palabra.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(mana sutiyuq)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -120,7 +120,7 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation> </translation>
     </message>
@@ -129,32 +129,32 @@
         <translation type="obsolete">From %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Pantay mask&apos;aspa: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Simikunata wisq&apos;ay:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Expresiones compuestas:</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Palabras individuales:</translation>
     </message>
@@ -162,47 +162,47 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,99 +211,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>El recurso referido no existe.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;T&apos;inkisqata kichay</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Musuq pestañapi t&apos;inkisqata kichay</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Abrir enlace en un &amp;navegador web externo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&quot;%1&quot;ta &amp;mask&apos;ay </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>&amp;Musuq pestañapi &quot;%1&quot;ta mask&apos;ay</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>%2pi &quot;%1&quot;ta mask&apos;ay</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>&amp;Musuq pestañapi %2pi &quot;%1&quot;ta mask&apos;ay</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -316,37 +317,37 @@
         <translation type="obsolete">Para activar reproducción de archivos no WAV, por favor vaya a Editar|Preferencias, escoja la pestaña Audio y seleccione &quot;Reproducir con DirectShow&quot;.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Fallo ejecutando un reproductor para reproducir el archivo de audio: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Temporal archiwuta yurichispa pantay.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Fallo abriendo automáticamente el archivo de recursos. Intente abrirlo manualmente: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>El recurso ha fallado de descargar.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation type="unfinished">WILLAY: %1</translation>
     </message>
@@ -356,42 +357,44 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>willay:chusaq</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Mask&apos;ay:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Ñawpa</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Qhipa</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;JATUNKUNA/juch&apos;uykuna</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -416,6 +419,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Pakasqa simi:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -516,6 +542,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Chinkachiy</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -558,6 +697,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -573,6 +722,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Llank&apos;achkanña</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Suti</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Maypi</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -594,17 +811,22 @@
         <translation>Kay juñuta allinchay</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,39 +834,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Pukyukuna</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Simi-pirwakuna</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Juñukuna</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Fuentes modificados</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Algunos fuentes fueron cambiados. ¿Quieres aceptar los cambios?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Chaskiy</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Chinkachiy</translation>
     </message>
@@ -663,6 +885,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Ni ima</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Ni ima</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -701,6 +1009,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Chinkachiy</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -740,43 +1107,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>J&amp;uñuta yapay</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Musuq juñuman churay kay sutita:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Waq sutita churay</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Churay musuq sutita kay juñuman:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Juñuta chinkachiy</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; juñuta chinkachiyta munankichu?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>&amp;Tukuy juñukunata chinkachiy</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Tukuy juñukunata chinkachiyta munankichu?</translation>
     </message>
@@ -881,6 +1258,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Ñawpaq</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Qhipa</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Jatunyachiy</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Juch&apos;uyyachiy</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Mana aqllasqa chhikan</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -911,7 +1336,7 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Qillqata allinchanapaq: </translation>
     </message>
@@ -1656,7 +2081,7 @@
         <translation type="obsolete">Zulu</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfología %1</translation>
     </message>
@@ -1664,12 +2089,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Llank&apos;achkanña</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Suti</translation>
     </message>
@@ -2709,7 +3134,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Simi-pirwakunata jap&apos;ikuspa pantay </translation>
     </message>
@@ -2717,7 +3142,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,17 +3154,17 @@
         <translation type="obsolete">Wamp&apos;unapaq chumpi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Ñawpaq</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Qhipa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Juch&apos;uy qhawanapi mask&apos;ay</translation>
     </message>
@@ -2748,23 +3173,23 @@
         <translation type="obsolete">Pronounce word</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Qhapaq qhawanata &amp;rikhuchiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Lluqsiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Jap&apos;ikuchkan...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Saltar esta versión</translation>
     </message>
@@ -2773,22 +3198,22 @@
         <translation type="obsolete">[Sconosciuto]</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Raphita kamachina</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Mana impresora nisqaqa kanchu. Por favor instale una impresora.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Raphipi articulota ñit&apos;iy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Jinata articulota jallch&apos;ay</translation>
     </message>
@@ -2797,12 +3222,12 @@
         <translation type="obsolete">Archiwukuna HTML (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Pantay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>&quot;%1&quot; articulota mana jallch&apos;ayta atinchu </translation>
     </message>
@@ -2811,33 +3236,33 @@
         <translation type="obsolete">Error loading dictionaries</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 simi-pirwakuna, %2 articulokuna, %3 simikuna</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Fallo de inicializar monitoreo de teclas de acceso rápido.&lt;br&gt;Asegúrese que su XServer tiene activada la extensión RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Una nueva versión está disponible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Ahora versión &lt;b&gt;%1&lt;/b&gt; de GoldenDict está disponible para descargar.&lt;br&gt;Haga clic en &lt;b&gt;Descargar&lt;/b&gt; para ir a página de descargas.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Urayachiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Mask&apos;ay:</translation>
     </message>
@@ -2846,168 +3271,179 @@
         <translation type="obsolete">Simi-pirwaqpa chumpinpi sutikunata rikhurichiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Simita parlachiy (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Jatunyachiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Juch&apos;uyyachiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Mana aqllasqa chhikan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Simikunata jatunyachiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Simikunata juch&apos;uyyachiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Mana aqllasqa chhikanpa simikunan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Kunan pestañata wisq&apos;ay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Tukuy pestañakunata wisq&apos;ay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Tukuy pestañakunata wisq&apos;ay, mana kunan pestañachu </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Mask&apos;ay:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Tukuy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Kichasqa Pestañas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(Mana sutiyuq)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3016,38 +3452,38 @@
         <translation type="obsolete">WILLAY: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3065,27 +3501,27 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Archiwu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Allinchay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Yanapa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Aqllanakuna...</translation>
     </message>
@@ -3094,7 +3530,7 @@
         <translation type="obsolete">&amp;Sources...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
@@ -3103,163 +3539,193 @@
         <translation type="obsolete">&amp;Juñukuna...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Qhaway</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Jatunyachiy/Juch&apos;uyachiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Yuyaynin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Simi-pirwakuna...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation type="unfinished">F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;GoldenDictpa raphin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;GoldenDictmanta willaway</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>GoldenDictmanta willaway</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Programa nisqamanta lluqsiy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Foro (Rimanakusun)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Sistema nisqaqpa chumpinman wisq&apos;ay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Sistema nisqaqpa chumpinman programata juch&apos;uyyachin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Articulo nisqata jallch&apos;ay </translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Articulo nisqata jallch&apos;ay </translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Raphipi ñit&apos;iy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Raphita kamachina</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Raphipi ñit&apos;inapaq qhawanaraq</translation>
     </message>
@@ -3268,48 +3734,48 @@
         <translation type="obsolete">Hukmanta archiwukunata ñawichay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Pichay</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3325,12 +3791,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3338,7 +3804,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XMLta ñawichaspa pantay: %1 &quot;%2,%3&quot;pi </translation>
     </message>
@@ -3346,7 +3812,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XMLta ñawichaspa pantay: %1 &quot;%2,%3&quot;pi</translation>
     </message>
@@ -3354,22 +3820,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Llank&apos;achkanña</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Suti</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Maypi</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3382,88 +3848,94 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Siqipi simi-pirwakunata ñiqichanapaq:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Mana jap&apos;isqa simi-pirwakuna:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Simi-pirwamanta willay</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Suti:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Jayk&apos;a articulokuna:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Jayk&apos;a simikuna:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Simimanta:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Simiman:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Kay simi-pirwaqa chay archiwukunayoq:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Ajuste el orden, arrastrando y soltando los diccionarios con el ratón. Mueva diccionarios al grupo deshabilitado para desactivar su uso</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Ñan</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Recursivo</translation>
     </message>
@@ -3614,24 +4086,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Selecciona si el modo de escaneo está activado por defecto o no. Si está
 marcado, el programa siempre iniciará con el modo de escaneo habilitado.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3643,27 +4120,27 @@
 despues la seleccion esté hecha.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Teclakuna</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Usar la siguiente combinación de teclas para mostrar u ocultar la ventana principal:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Usar la tecla siguiente para traducir una palabra en la porta-papeles:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Las teclas de acceso rápido están globales y funcionan desde cualquier programa o contexto mientras que GoldenDict estén ejecutando en el fondo.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Juch&apos;uy qhawanapi mask&apos;ay</translation>
     </message>
@@ -3673,7 +4150,7 @@
         <translation>Sistema nisqaqa qallariqtinkama, GoldenDictqa qallarinpis.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -3689,156 +4166,156 @@
         <translation type="obsolete">Scan popup functionality</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Juch&apos;uy qhawanapi mask&apos;ay</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Programaqa qallariqtin juch&apos;uy qhawanapi maskay</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Con esto habilitado, la ventana emergente sólo aparece si todas las teclas 
 seleccionadas estén oprimidas cuando la selección de la palabra cambie.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Tukuy kay teclakunata ñit&apos;inaykikama, juch&apos;uy qhawanata rikhurichinqa:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Sapalla lluq&apos;i CTRL </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Lluq&apos;i CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Sapalla paña MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Paña MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tecla ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tecla CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Sapalla lluq&apos;i ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Lluq&apos;i ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tecla MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Sapalla paña ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Paña ALT</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Sapalla paña CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Paña CTRL</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Sola MAYÚSCULA de izquierda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Lluq&apos;i MAYÚSCULA</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tecla de WINDOWS o META</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>WINDOWSchu METAchu</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Teclasta ñit&apos;iyta atinki</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
         <translation>Para evitar positivos falsos, las teclas sólo son monitoreadas después de la terminación de la selección adentro un tiempo limitado, que está especificado aquí.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>qhipa segundokuna </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3851,57 +4328,92 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Nota: Aparece que la extensión RECORD está rota en tu instalación de X.Org XServer. Las teclas de acceso rápido de GoldenDict probablemente no funcionan. Este problema puede ser arreglado en el servidor mismo. Por favor consulte al &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;reportaje de bug&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; y se puede entregar comentarios allí.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Chanra</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Parlachina</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Qhapaq qhawanapi kunanpacha simikunata parlachiy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Juch&apos;uy qhawanapi kunanpacha simikunata parlachiy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Takichina</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3926,38 +4438,38 @@
         <translation type="obsolete">Phonon nisqawan takichiy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Usar cualquier programa para reproducir archivos de audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Takichiy jawa programawan:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3965,86 +4477,86 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4053,73 +4565,73 @@
         <translation type="obsolete">Program to play audio files:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Llika</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Habilite está opción si Ud. quiere utilizar un 
 servidor proxy por todas las solicitudes de red del programa.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Servidor proxy nisqawan t&apos;inkichiy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Punku:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>jap&apos;iq masi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Pakasqa simi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
         <translation>Habilitando esta opción bloqueará la mayoría de propagando comercial, porque no permite contenido (imágenes y marcos) que no vienen directamente del sitio utilizado. Si causa problemas con algunos sitios, deshabilite esta opción. </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>No permite la carga de contenido de otros sitios (oculta la mayoría de propaganda)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -4132,12 +4644,12 @@
 la página web para descargarla.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Verificar periódicamente si haya una nueva versión del programa</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Sistema nisqaqpa simin</translation>
     </message>
@@ -4150,32 +4662,33 @@
         <translation type="obsolete">Russian</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Mana aqllasqa</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4184,12 +4697,12 @@
         <translation type="obsolete">DirectShow nisqawan takichiy</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Simita t&apos;ikrachkan</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Musuq simita jap&apos;ikunanpaq hukmanta programata qallarichiy.</translation>
     </message>
@@ -4197,27 +4710,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4243,27 +4756,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation type="unfinished">Llank&apos;achkanña</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation type="unfinished">Suti</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,12 +4784,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4387,18 +4902,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation type="unfinished">El recurso ha fallado de descargar.</translation>
     </message>
@@ -4406,12 +4921,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Romanización hepburn de Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Romanización hepburn de Katakana</translation>
     </message>
@@ -4444,12 +4959,12 @@
         <translation type="obsolete">simi</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation type="unfinished">Ñawpaq</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation type="unfinished">Qhipa</translation>
     </message>
@@ -4462,32 +4977,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Simita parlachiy (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Simi-pirwakunawan chumpita rikhurichin chaymanta pakachintaq</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Utilice esto para fijar la ventana en la pantalla, redimensionarla o gerenciarla en otra manera.</translation>
@@ -4497,11 +5012,11 @@
         <translation type="obsolete">List matches</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4514,8 +5029,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4523,17 +5038,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Ñan</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Suti</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4541,45 +5056,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(no disponible en versión portátil)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Directorio nisqata aqllay</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Chinkachiyta munankichu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿&lt;b&gt;%1&lt;/b&gt; directorio chinkachiyta munankichu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>¿&lt;b&gt;%1&lt;/b&gt; raphita chinkachiyta munankichu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4602,7 +5119,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Yapay...</translation>
     </message>
@@ -4611,7 +5129,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Chinkachiy</translation>
     </message>
@@ -4680,32 +5199,32 @@
         <translation type="obsolete">(&quot;CP1251&quot;wan &quot;%GD1251%&quot;ta rantinqa. &quot;ISO 8859-1&quot;wan &quot;%GDISO1%&quot;ta rantinqa)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Pronuncia directamente de &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Este sito permite que la gente grabe y comparta pronunciaciones de palabras que pueden ser escuchadas desde GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Forvo nisqawan parlachiy</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API nisqaqpa chimpun:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -4715,7 +5234,7 @@
 propia clave personalizada.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4744,79 +5263,89 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Simikunaqpa chimpunku (coma nisqakunawan t&apos;aqasqa):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Simi munaykinkiLista de códigos de lenguas que Ud. quiere utilizar. Por Ejemplo: &quot;en, ru, es&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Una lista completa de los códigos de lenguas está disponible &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;aquí&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Waq qillqaman t&apos;ikray</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Ruso qillqaman t&apos;ikray</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Griego qillqaman t&apos;ikray</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Aleman qillqaman t&apos;ikray</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Habilita el alfabeto romano para escribir la lengua japonesa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Romano qillqapi japonés simita t&apos;ikray</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemas:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>El sistema más utilizado para transcribir japonés,
 basado en la fonología inglesa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4827,12 +5356,12 @@
 Todavia no implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4843,32 +5372,32 @@
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Silabario:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Silabario de Japonés Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Silabario de Japonés Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -5012,22 +5541,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Llank&apos;achkanña</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Suti</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Maypi</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5035,7 +5564,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Simi-pirwakunapi mask&apos;aspa pantay</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/ru_RU.ts goldendict-1.5.0~git20150923/locale/ru_RU.ts
--- goldendict-1.5.0~git20131003/locale/ru_RU.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/ru_RU.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Неизвестно]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>На базе Qt %1 (%2, %3 бит)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Развернуть статью</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Свернуть статью</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>В группе &lt;b&gt;%2&lt;/b&gt; не найдено перевода для &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>В группе &lt;b&gt;%1&lt;/b&gt; перевод не найден.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Добро пожаловать!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Добро пожаловать в &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Если вы запустили программу в первый раз, укажите пути к словарям в &lt;b&gt;Правка|Словари&lt;/b&gt;. Там же Вы можете указать различные сайты Википедии или другие источники данных, настроить порядок просмотра словарей или создать словарные группы.&lt;p&gt;После этого Вы можете приступать к поиску слов. Слова можно искать в левой области данного окна. При работе в других приложениях можно искать слова, используя &lt;a href=&quot;Работа с всплывающим окном&quot;&gt;всплывающее окно&lt;/a&gt;. &lt;p&gt;В меню &lt;b&gt;Правка|Параметры&lt;/b&gt; Вы можете настроить приложение по своему вкусу. Все параметры имеют подсказки, показываемые при наведении курсора на них. Обращайте, пожалуйста, на них внимание, когда у Вас возникают затруднения с настройкой.&lt;p&gt;Если Вам требуется дополнительная помощь, возникли какие-то вопросы, пожелания и т.п., обращайтесь на &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;форум программы&lt;/a&gt;.&lt;p&gt;Обновления программы доступны на её &lt;a href=&quot;http://goldendict.org/&quot;&gt;вебсайте&lt;/a&gt;.&lt;p&gt;© Константин Исаков (ikm@goldendict.org), 2008-2013. Лицензия: GNU GPLv3 или более поздняя версия.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Работа с всплывающим окном</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Всплывающее окно&lt;/h3&gt;Для поиска слов из других приложений, вам нужно включить &lt;i&gt;«Разрешить всплывающее окно»&lt;/i&gt; в &lt;b&gt;Параметрах&lt;/b&gt; и после этого включить всплывающее окно кнопкой «Сканировать» в основном окне или в контекстном меню значка в системном лотке.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Теперь подведите курсор мыши к какому-либо слову в приложении, и появится всплывающее окно с переводом или значением этого слова.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Теперь выделите какое-либо слово в приложении (двойным щелчком, или же проводя по ним курсором мыши при зажатой левой кнопке), и появится всплывающее окно с переводом или значением этого слова.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(без имени)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(картинка)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Развернуть статью</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Из словаря </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Свернуть статью</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Ошибка поиска: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Близкие слова: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Составные выражения: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Отдельные слова: </translation>
     </message>
@@ -143,179 +143,180 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Выделить текущую статью</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Копировать как текст</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Инспектор</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Ресурс</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Синтезатор голоса</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Картинка</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Видео: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Определение из словаря «%1»: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Определение: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Запрошенный ресурс не найден.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Указанная аудио-программа не найдена.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ОШИБКА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Сохранить звук</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Звуковые файлы (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Файлы изображений (*.bmp *.jpg *.png *.tif);;Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Открыть ссылку</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Открыть ссылку в новой &amp;вкладке</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Открыть ссылку во внешнем &amp;браузере</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Поиск «%1»</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Поиск «%1» в &amp;новой вкладке</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Поместить «%1» в строку ввода</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>Добавить «%1» в журнал</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Поиск «%1» в %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Поиск «%1» в %2 в &amp;новой вкладке</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>ПРЕДУПРЕЖДЕНИЕ: Плейер FFMpeg: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Невозможно запустить проигрыватель звукового файла: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Ошибка создания временного файла.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Ошибка открытия файла ресурса, попробуйте открыть вручную: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Невозможно загрузить указанный ресурс.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Сохранить &amp;изображение...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Сохранить &amp;звук...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ВНИМАНИЕ: %1</translation>
     </message>
@@ -325,42 +326,44 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Искать:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Предыдущее</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Следующее</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>Учитывать &amp;регистр</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Пометить &amp;все</translation>
     </message>
@@ -386,6 +389,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>Прокси-сервер требует авторизацию</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>Для доступа к прокси-серверу необходимо ввести имя и пароль</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>Имя:</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -486,6 +512,121 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>Режим поиска</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>Этот элемент определяет, как будет интерпретироваться строка фильтра</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>Если этот флажок установлен, фильтрация будет
+осуществляться с учётом регистра символов</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>Учитывать регистр</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>Экспортировать заголовки в файл</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>Экспорт</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation>Справка</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>Нажмите эту кнопку чтобы применить фильтр к списку заголовков</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>Применить</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>Если этот флажок установлен, любые изменения фильтра
+будут применяться к списку заголовков немедленно</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>Автоприменение</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>Фильтр:</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>Строка фильтра (простой текст, шаблон или регулярное выражение)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>Шаблон</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>Рег. выражение</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>Неповторяющихся заголовков всего: %1, отфильтрованых: %2</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>Сохранить заголовки в файл</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>Текстовые файлы (*.txt);;Все файлы (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>Экспортируются заголовки...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -528,6 +669,16 @@
         <translation>Описание:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>Показать все неповторяющиеся заголовки словаря</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>Заголовки</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -543,6 +694,76 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation>Адрес: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation>Базы данных: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation>Стратегии поиска: </translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation>Базы данных сервера</translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation>Включено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation>Название</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation>Базы</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation>Стратегии</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation>Значок</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>Список баз, разделённый запятыми
+(пустая строка или &quot;*&quot; соответствует всем базам сервера)</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation>Список стратегий поиска, разделённый запятыми
+(пустая строка означает стратегию &quot;prefix&quot;)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -560,17 +781,22 @@
         <translation>Изменить эту группу</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Информация о словаре</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>Заголовки словаря</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Открыть папку словаря</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Редактировать словарь</translation>
     </message>
@@ -578,39 +804,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Источники</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Словари</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Группы</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Источники изменены</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Источники были изменены. Принять внесенные изменения?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -629,6 +855,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>Нет</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>Полнотекстовый поиск</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>Слова точно</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>Простой текст</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>Шаблоны</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>Рег. выр.</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>Промежуточных слов, не более (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>Статей на словарь, не более (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>Статей найдено: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>Индексируется: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>Символы CJK в строке поиска несовместимы с режимами поиска &quot;Слова точно&quot; и &quot;Простой текст&quot;</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation>Строка поиска должна включать как минимум одно слово из </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation> или более символов</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>Нет словарей для полнотекстового поиска</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>Нет</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -667,6 +979,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>Искать</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>Учитывать регистр</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>Режим:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>Статей найдено:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>Доступных словарей в группе:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>Ожидают индексации:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>Всего:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>Проиндексированных:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>Индексируется: Нет</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation>Справка</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -706,43 +1077,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>Группы</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>Открыть список групп</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Добавить группу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Введите название новой группы:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Переименовать группу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Введите новое название группы:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Удалить группу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Удалить группу &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Удалить все</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Удалить все группы?</translation>
     </message>
@@ -843,6 +1224,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation>Справка GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation>Домой</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation>Вперёд</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation>Увеличить</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation>Уменьшить</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation>Обычный размер</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation>Содержание</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation>Индекс</translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -873,12 +1302,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Варианты написания: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 (морфология)</translation>
     </message>
@@ -886,12 +1315,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
@@ -1931,7 +2360,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Ошибка при загрузке словарей</translation>
     </message>
@@ -1939,7 +2368,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Ошибка в файле конфигурации. Продолжить с настройками по умолчанию?</translation>
     </message>
@@ -1947,536 +2376,578 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Вперёд</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Сканировать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Показать &amp;основное окно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Загрузка...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Пропустить данную версию</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Вы скрыли главное меню. Чтобы вернуть его, используйте %1.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Параметры страницы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>В системе не установлено ни одного принтера.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Печать статьи</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Сохранить статью как</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Невозможно сохранить статью: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>Словарей: %1, статей: %2, слов: %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Ошибка инициализации механизма отслеживания горячих клавиш.&lt;br&gt;Убедитесь, что ваш XServer поддерживает расширение RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Доступна новая версия</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Версия &lt;b&gt;%1&lt;/b&gt; программы GoldenDict доступа для загрузки.&lt;br&gt;
 Нажмите &lt;b&gt;Загрузить&lt;/b&gt;, чтобы перейти на страницу загрузки.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Загрузить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Поиск в:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Главное меню</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Найдено в словарях:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Произнести слово (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>По&amp;казывать названия в панели словарей</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>&amp;Маленькие значки в панели инструментов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Навигация</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Обычный размер</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Увеличить список слов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Уменьшить список слов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Обычный размер для списка слов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Закрыть текущую вкладку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Закрыть все вкладки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Закрыть все вкладки, кроме текущей</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Искать:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Интерфейс Accessibility не включён</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Главное окно всегда поверх других окон.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Импорт журнала из файла</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Ошибка импорта: некорректные данные в файле</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Импорт журнала завершён</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Ошибка импорта:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Информация о словаре</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>Заголовки словаря</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Открыть папку словаря</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Редактировать словарь</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Открытые вкладки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>Строка для поиска в словарях. Можно использовать шаблоны &apos;*&apos;, &apos;?&apos; и диапазоны символов &apos;[...]&apos;.
+Чтобы найти сами символы &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos;, используйте &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; соответственно.</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Открыть список вкладок</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(без имени)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Статья полностью (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Статья, только HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Сохранение статьи...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Спрятать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Экспорт журнала в файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Текстовые файлы (*.txt);;Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Экспорт журнала завершён</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Ошибка при экспорте: </translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Добро пожаловать!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Панель по&amp;иска</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Панель на&amp;вигации по переводу</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Параметры...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Масштаб</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Журнал</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>Поиск</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Панель журнала</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Словари...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Веб-сайт</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>О программе GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation>Справка GoldenDict</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Выйти из приложения</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Форум</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Свернуть в лоток</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Свёртывает окно в лоток</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Сохранить статью</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Сохранить статью</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Печатать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>П&amp;араметры страницы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Пр&amp;едварительный просмотр</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Пе&amp;ресканировать файлы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Новая вкладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>П&amp;оверх других окон</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Поверх других окон</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Кнопка меню</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>Поиск на странице</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>Полнотекстовый поиск</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>О&amp;чистить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Новая вкладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Папка конфигурации</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Показать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Экспортировать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Импортировать</translation>
     </message>
@@ -2484,12 +2955,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Файл словаря искажён или повреждён</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Ошибка загрузки статьи из %1, причина: %2</translation>
     </message>
@@ -2497,7 +2968,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Ошибка разбора XML: %1 на строке %2, столбце %3</translation>
     </message>
@@ -2505,7 +2976,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Ошибка разбора XML: %1 на строке %2, столбце %3</translation>
     </message>
@@ -2513,22 +2984,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Значок</translation>
     </message>
@@ -2541,88 +3012,90 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Порядок словарей:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Неактивные (отключенные) словари:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Информация о словаре</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Количество статей:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Количество слов:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Исходный язык:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Целевой язык:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Файлы, из которых состоит словарь:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Изменяйте порядок словарей, перетаскивая словари мышкой. Для отключения словаря перетащите его в неактивную группу снизу.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Сортировать по имени</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Сортировать по языкам</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>Заголовки словаря</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation>Словарей активных: %1, неактивных: %2</translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Путь</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Рекурсивно</translation>
     </message>
@@ -2735,13 +3208,13 @@
         <translation>Переводить выбранное слово по двойному щелчку</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Включать или нет режим всплывающего окна при запуске программы.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2757,27 +3230,27 @@
 того, как слово было выделено.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Горячие клавиши</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Использовать следующую комбинацию для показа/скрытия основного окна:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Использовать следующую комбинацию для перевода слова из буфера обмена:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Горячие клавиши являются глобальными и работают из любой программы и в любом состоянии, до тех пор пока GoldenDict работает в фоне.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Всплывающее окно</translation>
     </message>
@@ -2830,17 +3303,22 @@
         <translation>Дополнительный стиль:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation>Язык справки</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Устанавливайте эту величину, чтобы избежать слишком больших контекстных меню</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Предел количества словарей в контекстном меню:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2851,134 +3329,134 @@
 включить или отключить в основном окне и в контекстом меню значка в системном лотке.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Разрешить всплывающее окно</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Включить режим всплывающего окна при запуске</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Показывать всплывающее окно, только если все выбранные клавиши
 находятся в зажатом состоянии в момент выделения слова.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Показывать всплывающее окно только при зажатых клавишах:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>При зажатии левой клавиши Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Левый Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>При зажатии правой клавиши Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Правый Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>При зажатии любой клавиши Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>При зажатии любой клавиши Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>При зажатии левой клавиши Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Левый Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>При зажатии любой клавиши Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>При зажатии правой клавиши Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Правый Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>При зажатии правой клавиши Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Правый Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>При зажатии левой клавиши Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Левый Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>При зажатии клавиши Windows или Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win или Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Задержка проверки модификаторов</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2987,54 +3465,89 @@
 промежутка времени, который и задается здесь.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>секунд(ы)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Отправлять переводимое слово в главное окно программы вместо перевода его во всплывающем окне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Отправлять переводимое слово в главное окно</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Воспроизведение звуков через FFmpeg(libav) и libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Использовать встроенный движок</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>Использовать системные настройки</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>Использовать свои настройки</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>Свои настройки</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Некоторые сайты опознают GoldenDict по заголовкам HTTP и блокируют запросы.
 Включите эту опцию, чтобы обойти проблему.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Не указывать GoldenDict в заголовках HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>Полнотекстовый поиск</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>Разрешить полнотекстовый поиск для:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>Не искать в словарях, содержащих более чем</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>статей (0 - неограниченно)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Дополнительные методы определения слова под курсором</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3045,12 +3558,12 @@
 Если вы не пользуетесь такими программами, включать эту опцию не нужно.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Использовать &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3059,12 +3572,12 @@
 Если вы не пользуетесь такими программами, включать эту опцию не нужно.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Использовать &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3073,88 +3586,88 @@
 Если вы не пользуетесь такими программами, включать эту опцию не нужно.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Использовать запрос &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Журнал</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Включите эту опцию, чтобы вести журнал переведённых слов</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Вести журнал</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Определяет максимальное количество записей в журнале</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Максимальный размер журнала:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Интервал сохранения журнала. Если он установлен в 0,
 журнал будет сохраняться только при выходе из программы.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Сохранять каждые</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>минут</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Статьи</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Включите эту опцию, если хотите всегда раскрывать дополнительные области статей</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Раскрывать дополнительные области</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Включите эту опцию чтобы автоматически сворачивать большие статьи</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Сворачивать статьи более чем</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Статьи размером более этой величины будут свёрнуты</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>символов</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3167,84 +3680,84 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Замечание: Кажется, Вы используете версию X.Org XServer, в которой отсутствует поддержка расширения RECORD. Вероятно, горячие клавиши в GoldenDict не заработают. Эта проблема должна быть исправлена на стороне XServer. Более подробную информацию смотрите на &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug entry&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; и, если хотите, оставляйте там свои пожелания.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аудио</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Произношение</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Автоматически произносить слова в главном окне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Автоматически произносить слова во всплывающем окне</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Воспроизведение</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Использовать любую внешнюю программу для проигрывания аудио-файлов</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Воспроизведение через внешнее приложение:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Сеть</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Включите, если хотите использовать прокси-сервер
 для всех сетевых запросов программы.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Использовать прокси-сервер</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Сервер:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3254,12 +3767,12 @@
 из-за этого функционировать, попробуйте запретить эту опцию.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Запретить загрузку информации с других сайтов (убирает большую часть рекламы)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3268,12 +3781,12 @@
 Чтобы это работало, плагины должны быть установлены.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Разрешить веб-плагины</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3286,52 +3799,53 @@
 страницу загрузки.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Проверять наличие новой версии</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Смена языка</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Перезапустите программу, чтобы изменение языка вошло в силу.</translation>
     </message>
@@ -3339,27 +3853,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>По префиксу</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -3385,27 +3899,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Имя программы</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Командная строка</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Значок</translation>
     </message>
@@ -3413,12 +3927,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Ошибка загрузки статьи</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Ошибка декодирования статьи</translation>
     </message>
@@ -3529,18 +4045,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ОШИБКА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Ошибка записи данных: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Невозможно загрузить указанный ресурс.</translation>
     </message>
@@ -3548,12 +4064,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Система Хэпбёрна (Хирагана)</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Система Хэпбёрна (Катакана)</translation>
     </message>
@@ -3574,59 +4090,59 @@
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Вперёд</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Произнести слово (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Отправить слово в главное окно (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Показать или спрятать словарную панель</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Нажмите, чтобы закрепить окно на экране, изменить его размер
 или какие-либо другие свойства.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3634,17 +4150,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Путь</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Значок</translation>
     </message>
@@ -3652,45 +4168,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Синтез речи</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(не реализовано в переносимой версии)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Выбор пути</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Подтверждение удаления</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Удалить путь &lt;b&gt;%1&lt;/b&gt; из списка?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Удалить веб-сайт &lt;b&gt;%1&lt;/b&gt; из списка?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Удалить программу &lt;b&gt;%1&lt;/b&gt; из списка?</translation>
     </message>
@@ -3709,7 +4227,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Добавить...</translation>
     </message>
@@ -3718,7 +4237,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Удалить</translation>
     </message>
@@ -3794,36 +4314,46 @@
     </message>
     <message>
         <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation>Серверы DICT</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation>Серверы DICT:</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Программы</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="353"/>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Любые внешние программы. Строка %GDWORD% будет заменена на запрашиваемое слово. Если такой строки нет, слово будет отправлено в стандартный входной поток.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Живое произношение с сайта &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Сайт позволяет людям записывать и обмениваться произношениями слов. Вы можете прослушивать их из GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Включить произношения с Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Ключ API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3833,79 +4363,79 @@
 сайте, чтобы получить свой собственный ключ.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Получите ваш ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;здесь&lt;/a&gt;, или оставьте пустым для использования ключа по умолчанию.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Список языковых кодов (через запятую):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Список кодов для языков, которые вы хотели бы использовать. Пример: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Полный список языковых кодов доступен &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;здесь&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Транслитерация</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Транслитерация (Русский)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Транслитерация (Греческий)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Транслитерация (Немецкий)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Транслитерация (Белорусский)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Позволяет использовать латинский алфавит для ввода на Японском</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Ромадзи (Японский)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Системы:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Наиболее популярный метод транскрибирования Японского,
 основанный на Английской фонологии</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Хэпбёрн</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3916,12 +4446,12 @@
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3932,32 +4462,32 @@
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Слоговые азбуки:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Слоговая азбука &quot;Хирагана&quot;</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Хирагана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Слоговая азбука &quot;Катакана&quot;</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Катакана</translation>
     </message>
@@ -4064,7 +4594,7 @@
     <message>
         <location filename="../translatebox.cc" line="103"/>
         <source>Type a word or phrase to search dictionaries</source>
-        <translation>Введите слово или словосочестание для поиска в словарях</translation>
+        <translation>Введите слово или словосочетание для поиска в словарях</translation>
     </message>
     <message>
         <location filename="../translatebox.cc" line="125"/>
@@ -4098,22 +4628,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Значок</translation>
     </message>
@@ -4121,7 +4651,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Ошибка поиска в некоторых словарях.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/sk_SK.ts goldendict-1.5.0~git20150923/locale/sk_SK.ts
--- goldendict-1.5.0~git20131003/locale/sk_SK.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/sk_SK.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Neznámy]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Založené na Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Rozbaliť článok</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Skrátiť článok</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>V skupine &lt;b&gt;%2&lt;/b&gt; nebol nájdený preklad pre &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>V skupine &lt;b&gt;%1&lt;/b&gt; nebol nájdený preklad.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Vitajte!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
-        <translation>&lt;h3 align=&quot;center&quot;&gt;Vitajte v programe&lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Prácu v programe začnite v &lt;b&gt;Upraviť|Slovníky&lt;/b&gt;, kde môžete pridať cesty k priečinkom v ktorých budú vyhľadané slovníky, nastaviť rôzne stránky Wikipedie a iné zdroje, upraviť poradenie poradenie slovníkov alebo vytvoriť slovníkové skupiny.&lt;/p&gt;&lt;p&gt;Potom budete môcť začať vyhľadať slová! Môžete tak robiť v tomto okne s použitím panela vľavo, alebo môžete &lt;a href=&quot;Working with popup&quot;&gt;vyhľadávať slová z iných aktívnych aplikácií&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Úpravu vlastností programu môžete urobiť &lt;b&gt;Upraviť|Nastavenia…&lt;/b&gt;. Všetky nastavenia majú popisy, ktoré vám pomôžu, pokiaľ si nebudete niečim istý.&lt;/p&gt;&lt;p&gt;Pokiaľ budete potrebovať ďalšiu pomoc, máte nejaké návrhy, alebo len chcete vedieť, čo si myslia iný, tak ste vítaní na &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;diskusnom fóre&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Aktualizácie hľadajte na &lt;a href=&quot;http://goldendict.org/&quot;&gt;stránkach GoldenDict&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencované pod GPLv3 alebo novšou.</translation>
+        <translation>&lt;h3 align=&quot;center&quot;&gt;Vitajte v programe &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Prácu v programe začnite v &lt;b&gt;Upraviť|Slovníky&lt;/b&gt;, kde môžete pridať cesty k priečinkom v ktorých budú vyhľadané slovníky, nastaviť rôzne stránky Wikipedie a iné zdroje, upraviť poradenie poradenie slovníkov alebo vytvoriť slovníkové skupiny.&lt;/p&gt;&lt;p&gt;Potom budete môcť začať vyhľadať slová! Môžete tak robiť v tomto okne s použitím panela vľavo, alebo môžete &lt;a href=&quot;Working with popup&quot;&gt;vyhľadávať slová z iných aktívnych aplikácií&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Úpravu vlastností programu môžete urobiť &lt;b&gt;Upraviť|Nastavenia…&lt;/b&gt;. Všetky nastavenia majú popisy, ktoré vám pomôžu, pokiaľ si nebudete niečim istý.&lt;/p&gt;&lt;p&gt;Pokiaľ budete potrebovať ďalšiu pomoc, máte nejaké návrhy, alebo len chcete vedieť, čo si myslia iný, tak ste vítaní na &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;diskusnom fóre&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Aktualizácie hľadajte na &lt;a href=&quot;http://goldendict.org/&quot;&gt;stránkach GoldenDict&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencované pod GPLv3 alebo novšou.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Práca s vyskakovacím oknom</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Práca s vyskakovacím oknom&lt;/h3&gt;Aby ste mohli vyhľadávať slová z iných aplikácií, potrebujete si najskôr aktivovať &lt;i&gt;„Vyskakovacie okno“&lt;/i&gt; v položke &lt;b&gt;Nastavenia&lt;/b&gt; a potom ju kedykoľvek povoľte kliknutím na &apos;Vyskakovaciu&apos; ikonu, alebo kliknutím na ikonu v systémovom panely cez pravé tlačidlo myši a následným výberom z ponuky.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Potom sa len nastavte kurzor nad slovom v inej aplikácií, ktoré chcete vyhľadať, a vyskočí okno, ktoré vám ho popíše.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Potom len vyberte akékoľvek slovo v inej aplikácií, ktoré chcete vyhľadať (dvojklikom alebo označením pomocou ťahania myšou) a vyskočí okno, ktoré vám to slovo popíše.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(Bez názvu)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(obrázok)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Rozbaliť článok</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Z </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Skrátiť článok</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Chyba požiadavky: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Blízke slová: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Zložené výrazy: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Jednotlivé slová: </translation>
     </message>
@@ -148,82 +148,84 @@
         <translation>Formulár</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about: blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Hľadať:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Predchádzajúci</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>Ď&amp;alší</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Citlivý na veľkosť písmen</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Zvýr&amp;azniť všetko</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Zdroj</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS Hlas</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Obrázok</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definícia zo slovníka &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definícia: %1</translation>
     </message>
@@ -232,38 +234,39 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Referencovaný zdroj neexistuje.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Odkazovaný audio program neexistuje.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>CHYBA: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Uložiť zvuk</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Zvukové súbory (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Uložiť obrázok</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Uložiť obrázky (*.bmp *.jpg *.png *.tif);;Všetky súbory (*.*)</translation>
     </message>
@@ -272,63 +275,63 @@
         <translation type="obsolete">Chyba ukladania zdroja: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Otvoriť odkaz</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Otvoriť odkaz v nove kar&amp;te</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Otvoriť odkaz v &amp;externom prehliadači</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Uložiť &amp;obrázok…</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Uložiť &amp;zvuk…</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Hľadať &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Hľadať &quot;%1&quot; v &amp;novej karte</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Odoslať &quot;%1&quot; do vstupného riadku</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>Prid&amp;ať &quot;%1&quot; do histórie</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Hľadať &quot;%1&quot; v %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Hľadať &quot;%1&quot; v %2 v &amp;novej karte</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>VAROVANIE: FFmpeg Audio Player: %1</translation>
     </message>
@@ -349,42 +352,42 @@
         <translation type="obsolete">Knižnica Bass nevie prehrať tento zvuk.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Nepodarilo sa spustiť prehrávač pre prehrávanie zvukových súborov: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Nepodarilo sa vytvoriť dočasný súbor.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Nepodarilo sa automaticky otvoriť súbor so zdrojmi. Pokúste sa ho otvoriť ručne: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>VAROVANIE: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Označiť aktuálny článok</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Kopírovať ako text</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Kontrolovať</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Referencovaný zdroj sa nepodarilo stiahnuť.</translation>
     </message>
@@ -410,6 +413,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Heslo:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -510,6 +536,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Textové súbory (*.txt);;Všetky súbory (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušiť</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -552,6 +691,16 @@
         <translation>Popis:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -568,6 +717,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Povolené</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Adresa</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Ikona</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -589,17 +806,22 @@
         <translation>Upraviť túto skupinu</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Info o slovníku</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Otvoriť slovníkový priečinok</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Upraviť slovník</translation>
     </message>
@@ -612,39 +834,39 @@
         <translation>Slovníky</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Zdroje</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>S&amp;lovníky</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>S&amp;kupiny</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Zdroje sa zmenili</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Niektoré zdroje boli zmenené. Chcete akceptovať zmeny?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Prijať</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
@@ -658,6 +880,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Žiadny</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Žiadny</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -696,6 +1004,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -826,7 +1193,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Odstrániť všetky skupiny</translation>
     </message>
@@ -836,42 +1203,100 @@
         <translation>Chyťte a pretiahnite slovníky do a zo skupín, posuňte ich dovnútra skupiny a meňte ich poradenie pomocou myši.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Pridať skupinu</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Zadajte názov novej skupiny:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Premenovať skupinu</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Zadajte nový názov skupine:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Odstrániť skupinu</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Ste si istí, že chcete odstrániť skupinu &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Ste si istí, že chcete odstrániť všetky skupiny?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Späť</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Vpred</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Priblížiť</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Oddialiť</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normálna veľkosť</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -902,12 +1327,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Návrhy k preklepom:</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 morfológia</translation>
     </message>
@@ -915,12 +1340,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Povolené</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Meno</translation>
     </message>
@@ -1960,7 +2385,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Chyba pri načítavaní slovníkov</translation>
     </message>
@@ -1968,7 +2393,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Chyba v konfiguračnom súbore. Pokračovať so štandardnými nastaveniami?</translation>
     </message>
@@ -1981,37 +2406,37 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Vitajte!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Súbor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Upraviť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomocník</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Zobrazenie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zväčšenie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>H&amp;istória</translation>
     </message>
@@ -2024,17 +2449,17 @@
         <translation type="obsolete">Výsledky navigačného panela</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Vy&amp;hľadávací panel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Panel výsledkov</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Panel &amp;histórie</translation>
     </message>
@@ -2043,149 +2468,179 @@
         <translation type="obsolete">&amp;Slovníky… F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Slovníky...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Nastavenia...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Domovská stránka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;O programe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>O GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Koniec</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Odísť z aplikácie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Fórum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Minimalizovať do lišty</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimalizuje okno do lišty okien</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Uložiť článok</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Uložiť článok</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Tlač</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Nastavenie s&amp;trany</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Náhľad pred &amp;tlačou</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Znovu vyhľadať súbory</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Nová karta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Vždy na vrchu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Vždy na vrchu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Tlačidlo Menu</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Náhľad pred tlačou</translation>
     </message>
@@ -2194,48 +2649,48 @@
         <translation type="obsolete">Znovu vyhľadať súbory</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Vymazať</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Nová karta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Konfiguračný priečinok</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Zobraziť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportovať</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importovať</translation>
     </message>
@@ -2248,18 +2703,18 @@
         <translation type="obsolete">Zobraziť malé ikony v paneloch</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Panel s ponukou</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Hľadať v:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Nájdené v slovníkoch:</translation>
     </message>
@@ -2268,127 +2723,127 @@
         <translation type="obsolete">Navigácia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Späť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Vpred</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Vyskakovanie okno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Vysloviť slovo (Alt + S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Priblížiť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Oddialiť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Normálna veľkosť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Zväčšiť slová</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Zmenšiť slová</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Bežná veľkosť slov</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Zobraziť &amp;hlavné okno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Zatvoriť aktuálnu kartu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Zatvoriť všetky karty</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Zatvoriť všetky karty okrem aktuálnej</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Načítavanie ...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>Slovníky: %1, články: %2, slová: %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Hľadať:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Všetko</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Otvorené karty</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Zobraziť názvy v &amp;panely slovníka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Zobraziť malé ikony v panely nás&amp;trojov</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigácia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Otvorí zoznam kariet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(Bez názvu)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2397,74 +2852,80 @@
         <translation type="obsolete">VAROVANIE: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Nepodarilo sa inicializovať monitorovací mechanizmus klávesových skratiek.&lt;br&gt; Uistite sa, že X server má zapnuté rozšírenie RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Je dostupná nová verzia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>GoldenDict verzia &lt;b&gt;%1&lt;/b&gt; je dostupná na stiahnutie.
 &lt;br&gt;Kliknutím na &lt;b&gt;Stiahnuť&lt;/b&gt; sa dostane na stránku, kde je možné program stiahnuť.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Stiahnuť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Preskočiť toto vydanie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>API Dostupnosti nie je povolené</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Vybrali ste si skrytie panelu s ponukou. Použite %1 ak ho chcete znova zobraziť.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Nastavenie strany</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Žiadna tlačiareň nie je k dispozícii. Prosím, nainštalujte aspoň jednu.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Vytlačiť článok</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Článok, Kompletný (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Článok, iba HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Uložiť článok ako</translation>
     </message>
@@ -2473,83 +2934,88 @@
         <translation type="obsolete">Html súbory (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Nie je možné uložiť článok: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Ukladanie článku…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Hlavné okno je nastavené, aby bolo vždy na vrchu.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>S&amp;kryť</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Exportovať históriu do súboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Textové súbory (*.txt);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Export histórie ukončený</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Chyba exportu:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Import histórie zo súboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Chyba importu: neplatné dáta v súbore</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Import histórie je ukončený</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Chyba importu:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Info o slovníku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Otvoriť slovníkový priečinok</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Upraviť slovník</translation>
     </message>
@@ -2557,12 +3023,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Slovníkový súbor bol poškodený alebo sfalšovaný</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Nepodarilo sa načítať článok z %1; dôvod: %2</translation>
     </message>
@@ -2570,7 +3036,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Chyba spracovania XML: %1 v %2,%3</translation>
     </message>
@@ -2578,7 +3044,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Chyba spracovania XML: %1 v %2,%3</translation>
     </message>
@@ -2586,22 +3052,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Povolené</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -2614,88 +3080,94 @@
         <translation>Formulár</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Poradie slovníkov:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>…</translation>
+        <translation type="obsolete">…</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Neaktívne (nepovolené) slovníky:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informácie o slovníku</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Meno:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Počet článkov:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Počet slov:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Prekladá z:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Prekladá do:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Súbory obsiahnuté v slovníku:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Upravte poradie uchopením a presunutím položky na požadované miesto. Presuňte slovníky do neaktívnej skupiny pre zakázanie ich použitia.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Zoradiť podľa názvu</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Zoradiť podľa jazyka</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Rekurzívne</translation>
     </message>
@@ -2849,22 +3321,27 @@
         <translation>Štýl rozšírenia:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Upravte túto hodnotu pre zabránenie veľkej kontextovej ponuky.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Limit slovníkov pre kontextovú ponuku:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>Vy&amp;skakovacie okno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2873,135 +3350,135 @@
 keď sa postavíte s myšou nad slovo (Windows) alebo ho označíte (Linux). Ak je povolené, môžete ho zapnúť a vypnúť z hlavného okna alebo ikony v systémovej oblasti.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Povoliť vyskakovacie okno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Určuje, či vyskakovacie okno je automaticky povolené, alebo zakázané. Pokiaľ je zaškrtnuté,
 program sa bude spúšťať s automaticky aktivovaným vyskakovacím oknom.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Spustiť s povoleným vyskakovacím oknom</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Pokiaľ toto povolíte, vyskakovacie okno sa zobrazí iba v prípade, keď budú stlačené zvolené klávesy počas výberu slova.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Zobraziť vyskakovacie okno iba pokiaľ sú stlačené vybrané klávesy:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Left Ctrl only</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Left Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Iba pravý Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Pravý Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Kláves Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Kláves Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Iba ľavý Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Ľavý Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Kláves Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Iba pravý Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Pravý Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Iba pravý Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Pravý Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Iba ľavý Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Ľavý Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Klávesa Windows alebo Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3012,54 +3489,54 @@
 až po označení slova.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Klávesy môžu byť stlačené postupne po</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
         <translation>Aby ste sa vyhli neúmyselnému spusteniu, klávesy sú monitorované iba niekoľko sekúnd (tu môžete nastaviť ich počet), potom čo označíte text.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Odoslať preložené slovo do hlavného okna namiesto jeho zobrazenia vo vyskakovacom okne</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Odoslať preložené slovo do hlavného okna</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Klávesové skratky</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Použite nasledujúcu klávesovú skratku pre zobrazenie alebo skrytie hlavného okna:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Použite nasledujúcu klávesovú skratku pre preklad slova zo schránky:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Klávesové skratky sú globálne a fungujú z akéhokoľvek programu a akomkoľvek kontexte pokiaľ GoldenDict beží na pozadí.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3072,57 +3549,92 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Poznámka: Zdá sa, že používate X.Org XServer verziu, ktorá má poškodené rozšírenie RECORD. Klávesové skratky v Goldendict preto nebudú pravdepodobne fungovať. Toto musí byť najskôr vyriešené v samotnom XServeri. Prosím pozrite sa na následujúce &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;chybové hlásenie&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; a keď chcete, tak tam dajte svoj komentár.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Výslovnosť</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Automaticky vysloviť slová v hlavnom okne</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Automaticky vysloviť slová vo vyskakovacom okne</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Prehrávanie</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Prehra audio súbory cez FFmpeg(libav) a libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Použiť interný prehrávač</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Vyberte túto ponuku pre automatické skrátenie dlhých článkov</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Skrátiť články väčšie než</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Články dlhšie než je táto veľkosť budú skrátené</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>symboly</translation>
     </message>
@@ -3155,71 +3667,71 @@
         <translation type="obsolete">Prehrať cez Bass knižnicu</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Použiť pre prehrávanie audio súborov externý program</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Použiť externý program:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Sieť</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Povoliť pokiaľ chcete použiť proxy server
 pre všetky sieťové požiadavky programu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Použiť proxy server</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Hostiteľ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Používateľ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
         <translation>Toto umožní GoldenDictu blokovať väčšinu reklám nepovolením obsahu (obrázky, rámce), ktoré pochádzajú z inej stránky, než je tá, ktorú prezeráte. Pokiaľ sa kvôli tomuto niektoré stránky pokazia, skúste túto voľbu zakázať.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Zakázať načítanie obsahu z iných webov (skryje väčšinu reklám)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3227,24 +3739,24 @@
 Zásuvný modul musí byť nainštalovaný, aby táto voľba fungovala.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Povoliť web zásuvné moduly</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Niektoré stránky odhalia GoldenDict cez HTTP hlavičky a blokujú jeho požiadavky.
 Povoľte toto nastavenie na obídenie problému.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Neidentifikovať GoldenDict v HTTP hlavičke</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3257,22 +3769,22 @@
 na stiahnutie.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Pravidelne kontrolovať dostupnosť nových verzií</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Pokročilé</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Extra technológie pre vyskakovacie okno</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3283,12 +3795,12 @@
 Nie je potrebné použiť túto voľbu, ak nepoužívate takéto programy.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Použiť &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3297,12 +3809,12 @@
 Nie je potrebné použiť túto voľbu, ak nepoužívate takéto programy.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Použiť &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3311,97 +3823,98 @@
 Nie je potrebné použiť túto voľbu, ak nepoužívate takéto programy.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Použiť &amp;GoldenDict správu</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>História</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Zapnite túto voľbu pre uchovanie histórie preložených slov</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Uchovať &amp;históriu</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Nastaví maximálny počet položiek pre uchovanie v histórií.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Maximálna veľkosť histórie:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Interval ukladania histórie. Ak je nastavený na 0, história sa bude ukladať pri ukončení.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Uložiť každých</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minút</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Články</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Zapnite túto voľbu, aby sa vždy vždy rozbalili voliteľné časti článkov</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Rozbaliť voliteľné &amp;časti</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Systémové nastavenie</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Štandardné</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Moderné</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3410,12 +3923,12 @@
         <translation type="obsolete">Hrať cez DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Zmena jazyka</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Reštartovať program pre aplikovanie zmeny jazyka.</translation>
     </message>
@@ -3423,27 +3936,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Obyčajný text</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Zhoda predpony</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Neznámy</translation>
     </message>
@@ -3469,27 +3982,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Povolené</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Príkazový riadok</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -3497,12 +4010,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Chyba načítania článku</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Chyba dekódovania článku</translation>
     </message>
@@ -3613,18 +4128,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>CHYBA: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Chyba ukladania zdroja: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Referencovaný zdroj sa nepodarilo stiahnuť.</translation>
     </message>
@@ -3632,12 +4147,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji pre Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji pre Katakana</translation>
     </message>
@@ -3666,21 +4181,21 @@
         <translation type="obsolete">Zoznam zhôd (Alt + M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Späť</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Vpred</translation>
     </message>
@@ -3689,32 +4204,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Vysloviť slovo (Alt + S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Poslať slovo do hlavného okna (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Zobrazí alebo skryje panel slovníkov</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Pomocou tohto môžete prišpendliť okno, tak že zostane na obrazovke,
@@ -3725,8 +4240,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3734,17 +4249,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -3766,7 +4281,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Pridať ...</translation>
     </message>
@@ -3775,7 +4291,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>Odst&amp;rániť</translation>
     </message>
@@ -3852,7 +4369,7 @@
         <translation type="obsolete">Prípadne môžete použiť %GD1251% pre CP1251, %GDISO1% pre ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programy</translation>
     </message>
@@ -3861,27 +4378,27 @@
         <translation type="obsolete">Akýkoľvek externý program. Reťazec %GDWORD% bude nahradený so slovom z požiadavky. Slovo bude tiež prevedené do štandardného vstupu.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Živá výslovnosť z &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Stánky umožňujú ľuďom nahrávať a zdieľa výslovnosť slov. V GoldenDicte si ich môžete vypočuť.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Povoliť výslovnosť z Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API kľúč:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3890,7 +4407,7 @@
 alebo sa na stránkach zaregistrujte a získajte vlastný kľúč.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Získajte svoj vlastný kľuč &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;tu&lt;/a&gt;, alebo ponechajte prázdne pre použitie štandardného kľúča.</translation>
     </message>
@@ -3920,79 +4437,89 @@
 %GDBIG5% pre Big-5, %GDBIG5HKSCS% pre Big5-HKSCS, %GDGBK% pre GBK a GB18030, %GDSHIFTJIS% pre Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Akýkoľvek externý program. Reťazec %GDWORD% bude nahradený so slovom požiadavky. Ak taký reťazec nebude nájdený, slovo bude vložené do štandardného vstupu.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Jazykové kódy (oddelené čiarkou):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Zoznam kódov jazykov, ktoré by ste chceli mať. Príklad: &quot;en, sk&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Úplný zoznam jazykových kódov je k dispozícii &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;tu&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Prepis</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Ruský prepis</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Grécky prepis</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Nemecký prepis</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Bieloruský prepis</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Umožňuje využívať latinku v japončine</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonské Romaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Systémy:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Najrozšírenejší spôsob japonskej transkripcie,
 založený na anglickej fonológií</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4003,12 +4530,12 @@
 Zatiaľ nie je implementovaný v GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4019,75 +4546,77 @@
 Zatiaľ nie je implementovaný v GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Šlabikáre:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Japonský šlabikár Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Japonský šlabikár Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Text na reč</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(Nie je k dispozícii v prenosnej verzií)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Vyberte si priečinok</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Potvrdiť odstránenie</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Odstrániť priečinok &lt;b&gt;%1&lt;/b&gt; zo zoznamu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Odstrániť stránku &lt;b&gt;%1&lt;/b&gt; zo zoznamu?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Odobrať program &lt;b&gt;%1&lt;/b&gt; zo zoznamu?</translation>
     </message>
@@ -4217,22 +4746,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Povolené</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -4240,7 +4769,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Nepodarilo sa dať požiadavku niektorým slovníkom.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/sq_AL.ts goldendict-1.5.0~git20150923/locale/sq_AL.ts
--- goldendict-1.5.0~git20131003/locale/sq_AL.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/sq_AL.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[E panjohur]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Bazuar në Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Zgjeroj artikullin</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Mbledh artikullin</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Nuk gjen përkthimin për &lt;b&gt;%1&lt;/b&gt; te grupi &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Nuk gjen përkthimin te grupi &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Mirë se erdhët!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Mirë se erdhët te &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Për të përdorur programin, së pari vizitoni &lt;b&gt;Editoj|Fjalorët&lt;/b&gt; dhe përcaktoni vendndodhjen e direktorisë ku janë skedat e fjalorit, sistemoni faqet për Wikipedia-n ose burimet e tjera, radhitni fjalorët e krijoni grupe me ta.&lt;p&gt;Pastaj jeni gati të studioni fjalët! Kryeni këtë duke përdorur panelin në të majtë, ose duke &lt;a href=&quot;Working with popup&quot;&gt;parë nga aplikacionet e tjera aktive&lt;/a&gt;. &lt;p&gt;Për të porositur programin, kontrolloni parametrat e mundshëm te &lt;b&gt;Editoj|Preferencat&lt;/b&gt;. Parametrat kanë këshilla ndihmëse: sigurohuni që t&apos;i lexoni nëse keni dyshime për diçka.&lt;p&gt;Nëse kërkoni ndihmë, keni pyetje, sugjerime ose doni të dini se ç&apos;mendojnë të tjerët për programin, jeni të mirëpritur te &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forumi&lt;/a&gt;.&lt;p&gt;Kontrolloni edhe &lt;a href=&quot;http://goldendict.org/&quot;&gt;faqen në internet&lt;/a&gt; për t&apos;u azhurnuar. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencuar sipas GPLv3 a më i vonë.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Working with popup</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Skanimi i jashtëm&lt;/h3&gt;Për të parë fjalët nga aplikacionet aktive, së pari aktivizoni &lt;i&gt;&quot;funksionin Skanimi i jashtëm&quot;&lt;/i&gt; te &lt;b&gt;Preferencat&lt;/b&gt;. Më tej e aktivizoni kurdoherë duke ndezur ikonën e &apos;Skanimit&apos;, ose duke klikuar me të djathtën ikonën te shiriti i sistemit. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Thjesht ndaleni kursorin te fjala që doni të shikoni nga aplikacioni tjetër, dhe do ju shfaqet një dritare me fjalën e treguar.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Thjesht seleksiononi me maus fjalën që doni të shikoni nga aplikacioni tjetër (klikojeni dy herë ose visheni me butonin e shtypur të miut), dhe do ju shfaqet një dritare me fjalën e treguar.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(pa titull)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(figurë)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Zgjeroj artikullin</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Nga </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Mbledh artikullin</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Gabimi i kërkimit: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Fjalët e përafërta: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Shprehjet e përbëra: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Fjalët e ndara: </translation>
     </message>
@@ -143,179 +143,180 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Seleksionoj këtë artikullin</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Kopjoj tekstin</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Inspektoj</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Resursi</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS Voice</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Figura</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Përkufizimi nga fjalori &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Përkufizimi: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Nuk ekziston resursi i referuar.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Programi audio i referuar nuk ekziston.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>GABIM: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Ruaj tingullin</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Skeda zanore (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Të gjitha skedat (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Ruaj imazhin</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Skeda imazhe (*.bmp *.jpg *.png *.tif);;Të gjitha skedat (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Hap lidhësin</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Hap lidhësin në fushën e &amp;re</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Hap lidhësin në &amp;shfletuesin e jashtëm</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Shikoj &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Shikoj &quot;%1&quot; në fushën e &amp;re</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Dërgoj &quot;%1&quot;te radha e inputit</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Shtoj &quot;%1&quot; te historiku</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Shikoj &quot;%1&quot; në %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Shikoj &quot;%1&quot; në %2 në fushën e &amp;re</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>KUJDEs: FFmpeg Audio Player: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Dështoi ekzekutimi i lexuesit për skedën zanore: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Dështoi krijimi i skedës kohëshkurtër.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Dështoi vetëhapja e skedës burimore, provojeni vetë: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Dështoi shkarkimi i resursit të referuar.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Ruaj &amp;imazhin...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Ruaj t&amp;ingullin...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>KUJDES: %1</translation>
     </message>
@@ -325,42 +326,44 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Gjej:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Kaluar</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Tjetër</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>Krahasoj &amp;shkrimin</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Theksoj &amp;të gjitha</translation>
     </message>
@@ -385,6 +388,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Fjalëkalimi:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -485,6 +511,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Skeda tekst (*.txt);;Të gjitha skedat (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuloj</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -527,6 +666,16 @@
         <translation>Përshkrimi:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -543,6 +692,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Aktiv</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Emri</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Ikona</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -560,17 +777,22 @@
         <translation>Editoj grupin</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Info për fjalorin</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Hap dosjen e fjalorit</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Editoj fjalorin</translation>
     </message>
@@ -578,39 +800,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Burimet</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Fjalorët</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupet</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Burimet e ndryshuara</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Disa burime u ndryshuan. Do i pranoni ndryshimet?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Pranoj</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Anuloj</translation>
     </message>
@@ -629,6 +851,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Asnjë</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Asnjë</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -667,6 +975,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuloj</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -706,43 +1073,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Shtoj grupin</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Vini emrin e grupit të ri:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Riemërtoj grupin</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Vini emrin e ri të grupit:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Heq grupin</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Jeni i sigurt për heqjen e grupit &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Heq tërë grupet</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Jeni i sigurt për heqjen e të gjitha grupeve?</translation>
     </message>
@@ -843,6 +1220,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Pas</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Para</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Zmadhoj</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Zvogëloj</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Përmasat normale</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -873,12 +1298,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Sugjerimet e rrokjezimit: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 Morfologjia</translation>
     </message>
@@ -886,12 +1311,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Emri</translation>
     </message>
@@ -1931,7 +2356,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Gabim në ngarkimin e fjalorëve</translation>
     </message>
@@ -1939,7 +2364,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Gabim në skedën e konfiguracionit.Do vijoni me parametrat standardë?</translation>
     </message>
@@ -1947,535 +2372,576 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Pas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Para</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Skanimi i jashtëm</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Shfaq dritaren &amp;kryesore</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Dal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Hap...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Kaloj këtë versionin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Zgjodhët të fshehni menynë.Përdorni %1 për ta rishfaqur.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Sistemimi i faqes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Nuk ka asnjë printer. Lutemi e instaloni më parë.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Printoj artikullin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artikull, i plotë (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artikull, vetëm HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Ruaj artikullin si</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Gabim</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Nuk ruan artikullin: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 fjalorë, %2 artikuj, %3 fjalë</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Dështoi nisja e mekanizmit monitorues të tasteve kryesore.&lt;br&gt;Sigurohuni që XServer e ka të ndezur zgjatimin RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Ka dalë version i ri</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Versioni &lt;b&gt;%1&lt;/b&gt; për GoldenDict është gati për t&apos;u shkarkuar.&lt;br&gt;Klikoni &lt;b&gt;Shkarkoj&lt;/b&gt;, që të hapni faqen e shkarkimit.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Shkarkoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Shikoj në:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Brezi i &amp;menysë</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Gjetjet në fjalorë:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Shqiptoj fjalën (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Tregoj emrat e &amp;fjalorëve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Tregoj ikonat e &amp;vogla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Lundrimi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Zmadhoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Zvogëloj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Përmasat normale</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Zmadhoj fjalët</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Zvogëloj fjalët</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Fjalët në përmasat normale</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Mbyll fushën</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Mbyll të gjitha fushat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Mbyll të gjitha fushat veç kësaj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Shikoj:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Të gjithë</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Accessibility API është joaktiv</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Ruan artikullin...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Dritarja kryesore qëndron gjithmonë në krye.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importoj historikun nga skeda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Gabim importi: skedë me të dhëna të pasakta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Përfundoi importi i historikut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Gabim importi:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Info për fjalorin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Hap dosjen e fjalorit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Editoj fjalorin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Fushat e hapura</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Hap listën e fushave</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(pa titull)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Fsheh</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Eksportoj historikun në skedë</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Skeda tekst (*.txt);;Të gjitha skedat (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Përfundoi eksporti i historikut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Gabim eksporti:</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Mirë se erdhët!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Skedar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Ndihmë</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferencat...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Pamje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zmadhimi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>H&amp;istorik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Fjalorët...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>Paneli i &amp;kërkimit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>Paneli i &amp;rezultateve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>Paneli i &amp;historikut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Faqja zyrtare</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Për</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Për GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Mbyll aplikacionin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forumi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Mbyll në shirit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimizon dritaren në shiritin e sistemit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Ruaj artikullin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Ruaj artikullin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Printoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Sistem&amp;oj faqen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Parashikoj &amp;shtypjen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Riskanoj skedat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Fushë e re</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Gjithmonë në krye</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Gjithmonë në krye</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Butoni i menysë</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Pastroj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Fushë e re</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Dosja e &amp;konfiguracionit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Shfaq</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksportoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importoj</translation>
     </message>
@@ -2483,12 +2949,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Skeda e fjalorit u manipulua ose u dëmtua</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Dështoi hapja e artikullit nga %1, arsyeja: %2</translation>
     </message>
@@ -2496,7 +2962,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Gabim në analizimin e XML: %1 në %2,%3</translation>
     </message>
@@ -2504,7 +2970,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Gabim në analizimin e XML: %1 në %2,%3</translation>
     </message>
@@ -2512,22 +2978,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Emri</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Аdresa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -2540,88 +3006,94 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Radha e fjalorëve:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Fjalorët joaktivë (e çaktivizuar):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Informacion për fjalorin</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Emri:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Artikujt totalë:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Totali i fjalëve:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Përkthen nga:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Përkthen në:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Përshkrimi:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Skedat që përbëjnë fjalorin:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Ndreqeni radhën duke kapur e lëshuar elementet. Kalojini fjalorët te grupi joaktiv për t&apos;i çaktivizuar.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Radhit sipas emrit</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Radhit sipas gjuhëve</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Shtegu</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Brendësia</translation>
     </message>
@@ -2729,14 +3201,14 @@
         <translation>Përkthej fjalën me dy klikime</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Zgjedh nëse mënyra standarde e skanimit të jashtëm është ndezur apo jo.
 Kur e zgjedh, programi nis gjithmonë me skanimin e jashtëm aktiv.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2746,27 +3218,27 @@
 tastet e zgjedhura mund të shtypen shkurt pas përzgjedhjes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Tastet kryesore</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Përdor një tast për të shfaqur a fshehur dritaren kryesore:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Përdor një tast për të përkthyer fjalën në kujtesën e kompjuterit:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Tastet kryesore punojnë përgjithësisht në çdo program, për aq kohë sa GoldenDict vepron në sfond.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Skanimi i jashtëm</translation>
     </message>
@@ -2817,17 +3289,22 @@
         <translation>Stili i shtesave:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Ndreq vlerën për të shmangur menytë e gjata të kontekstit.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Limiti i fjalorëve në meny:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2838,134 +3315,134 @@
 ose nga shiriti i sistemit.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Aktivizoj skanimin e jashtëm</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Nis me skanuesin e ndezur</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Kur e aktivizon, skanimi do funksionojë vetëm kur tërë tastet e përzgjedhura
 janë në gjendjen e shtypur.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Shfaq skanuesin vetëm kur shtyp tastet e përzgjedhura:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Vetëm Ctrl majtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl majtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Vetëm Shift djathtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Shift djathtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Tasti Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Tasti Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Vetëm Alt majtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt majtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Tasti Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Vetëm Alt djathtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt djathtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Vetëm Ctrl djathtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl djathtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Vetëm Shift majtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Shift majtas</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Tasti Windows ose Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Tastet mund të shtypen edhe më pas, brenda</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2974,22 +3451,22 @@
 e përcaktuar këtu.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Dërgon fjalën e përkthyer te dritarja kryesore, jo te dritarja kërcyese</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Dërgoj fjalën e përkthyer te dritarja kryesore</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3002,114 +3479,149 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Shënim: Duket sikur po punoni me një version të X.Org XServer që e ka të prishur zgjatimin RECORD. Ka mundësi që tastet kryesore në GoldenDict të mos funksionojnë. Kjo duhet ndrequr te vetë serveri. Ju lutem, raportojeni &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;këtë të metë&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; dhe lini një koment nëse doni.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Shqiptimi</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Autoshqiptoj fjalët në dritaren kryesore</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Autoshqiptoj fjalët e skanuara</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Riprodhimi</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Riprodhon skedat zanore me FFmpeg(libav) dhe libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Përdor lexuesin e brendshëm</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Kur e ndez, artikujt e mëdhenj do të mblidhen automatikisht.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Mbledh artikujt me më shumë se</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Artikujt mbi këtë përmasë do të mblidhen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>simbole</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Riprodhon skedat zanore me një program tjetër</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Përdor programin e jashtëm:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Rrjeti</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Aktivizojeni kur dëshironi të përdorni një server proxy
 për tërë kërkesat e programit për internet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Përdor server proxy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Lloji:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Hosti:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Porti:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Përdoruesi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Fjalëkalimi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3118,12 +3630,12 @@
 faqe shfaq probleme prej kësaj, çaktivizojeni.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Mohoj përmbajtjen nga faqet e tjera (fsheh shumicën e reklamave)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3132,24 +3644,24 @@
 Spina duhet instaluar që të funksionojë.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Aktivizoj spinat e internetit</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Disa faqe e njohin GoldenDict me anë të kokëve HTTP, dhe i bllokojnë kërkesat.
 Ky opsion e anashkalon problemin.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Nuk identifikoj GoldenDict në kokët HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3160,22 +3672,22 @@
 kërkon ta shkarkojë.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Verifikoj periodikisht versionet e reja të programit</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Av&amp;ancuar</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Teknologji shtesë për Skanimin e jashtëm</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3186,12 +3698,12 @@
 Nuk keni pse ta aktivizoni nëse nuk i përdorni këto programe.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Përdor &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3200,12 +3712,12 @@
 Nuk keni pse ta aktivizoni nëse nuk i përdorni këto programe.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Përdor &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3214,107 +3726,108 @@
 Nuk keni pse ta aktivizoni nëse nuk i përdorni këto programe.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Përdor mesazhet e &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historiku</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Kur e ndez, depozitohet historiku i fjalëve të përkthyera.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Depozitoj &amp;historikun</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Specifikoni numrin maksimal të njësive që ruhen në historik.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Masa maksimale e historikut:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Intervali i ruajtjes së historikut. Kur vendoset 0, historiku ruhet vetëm gjatë mbylljes së programit.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Ruaj çdo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minuta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artikujt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Kur e ndez, pjesët fakultative të artikujve zgjerohen gjithmonë.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Zgjeroj &amp;pjesët fakultative</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Standardi i sistemit</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes Blu</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Ndryshimi i Gjuhës</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Riniseni programin për të zbatuar ndryshimin e gjuhës.</translation>
     </message>
@@ -3322,27 +3835,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Tekst i thjeshtë</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Krahasoj parashtesën</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>E panjohur</translation>
     </message>
@@ -3368,27 +3881,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Lloji</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Emri</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Vija e komandës</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -3396,12 +3909,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Gabim në hapjen e artikullit</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Gabim në deshifrimin e artikullit</translation>
     </message>
@@ -3512,18 +4027,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>GABIM: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Gabim në ruajtjen e resursit: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Dështoi shkarkimi i resursit të referuar.</translation>
     </message>
@@ -3531,12 +4046,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hepburn Romaji për Hiragana</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Hepburn Romaji për Katakana</translation>
     </message>
@@ -3557,59 +4072,59 @@
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Pas</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Para</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Shqiptoj Fjalën (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Dërgoj fjalën te dritarja kryesore (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Shfaq ose fsheh brezin e fjalorit</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Këtë e përdor për të piketuar dritaren që të qëndrojë mbi ekran,
 që të marrë një përmasë të re ose për mënyrat e tjera.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3617,17 +4132,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Shtegu</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Emri</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -3635,45 +4150,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Tekst në tinguj</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(nuk mundësohet në versionin portabël)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Zgjedh direktorinë</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Miratoj heqjen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Do e hiqni direktorinë &lt;b&gt;%1&lt;/b&gt; nga lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Do e hiqni faqen &lt;b&gt;%1&lt;/b&gt; nga lista?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Do e hiqni programin &lt;b&gt;%1&lt;/b&gt; nga lista?</translation>
     </message>
@@ -3692,7 +4209,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Shtoj...</translation>
     </message>
@@ -3701,7 +4219,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Heq</translation>
     </message>
@@ -3765,32 +4284,32 @@
         <translation>Çdo faqe në internet. Radha %GDWORD% do zëvendësohet me fjalën e kërkuar:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programet</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Shqiptimet direkte nga &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Kjo faqe lejon individët të regjistrojnë shqiptimet e fjalëve dhe t&apos;i ndajnë ato me të tjerët. Mund të dëgjohen në GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Aktivizoj shqiptimet nga Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Кodi API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3798,7 +4317,7 @@
 që mund të mos lejohet në të ardhmen, ose regjistrohuni te faqja për të marrë kodin tuaj.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Merrni kodin tuaj &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;këtu&lt;/a&gt;, ose lëreni bosh për të përdorur standardin.</translation>
     </message>
@@ -3810,79 +4329,89 @@
 %GDBIG5% për Big-5, %GDBIG5HKSCS% për Big5-HKSCS, %GDGBK% për GBK and GB18030, %GDSHIFTJIS% për Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Çdo program i jashtëm. Vargu %GDWORD% do zëvendësohet me fjalën e kërkuar. Kur vargu nuk shkruhet, fjala jepet si input standard.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Kodet e gjuhëve (të ndara me presje):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista e kodeve të gjuhëve që doni të keni. Shembull: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Lista e plotë e kodeve të gjuhëve jepet &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;këtu&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Përkthimi</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Përkthimi Rusisht</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Përkthimi Greqisht</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Përkthimi Gjermanisht</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Përkthimi bjellorusisht</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Lejon përdorimin e alfabetit latin për të shkruar japonishten</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Japonishtja Romaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemi:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Metoda më e përhapur e tejshkrimit të japonishtes,
 e bazuar në fonologjinë japoneze</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3893,12 +4422,12 @@
 Akoma i pafutur në GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3909,32 +4438,32 @@
 Akoma i pafutur në GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Rrokjezimi:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Rrokjezimi i Japonishtes Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Rrokjezimi i Japonishtes Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
@@ -4074,22 +4603,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Emri</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
@@ -4097,7 +4626,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Dështoi kërkimi në disa fjalorë.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/sr_SR.ts goldendict-1.5.0~git20150923/locale/sr_SR.ts
--- goldendict-1.5.0~git20131003/locale/sr_SR.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/sr_SR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -38,7 +38,7 @@
         <translation>[Непознато]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>На основу Qt %1 (%2, %3 бита)</translation>
     </message>
@@ -46,17 +46,17 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Нема превода  &lt;b&gt;%2&lt;/b&gt;  пронађеног у групи &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>У групи &lt;b&gt;%1&lt;/b&gt; превод није пронађен.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Добро дошли!</translation>
     </message>
@@ -65,47 +65,47 @@
         <translation type="obsolete">&lt;h3 align=&quot;center&quot;&gt;Добро дошли у &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Ако покренете програм по први пут, одредите путању до речника у &lt;b&gt;Уреди|Речник&lt;/b&gt;. Ту можете да наведете разне сајтове Википедије или другe изворe података, подесите редослед у коме су речници или направите речник.&lt;p&gt;Након тога, можете да почнете да тражите речи. Речи се могу наћи у левом окну прозора. Када радите у другим апликацијама, можете да тражите речи, користећи &lt;a href=&quot;Рад са искачућим прозором&quot;&gt;искачући прозор&lt;/a&gt;. &lt;p&gt;У изборнику &lt;b&gt;Уреди|Поставке&lt;/b&gt;.Можете да подесите апликацију по свом укусу. Сви параметри су наговештаји који се приказују када пређете преко њих. Обратите пажњу на њих, када имате проблема са конфигурацијом.&lt;p&gt;Ако вам је потребна помоћ,било каква питања, захтеве, итд, погледајте&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt; Форум програма&lt;/a&gt;.&lt;p&gt;Ажурирање софтвера доступно на  &lt;a href=&quot;http://goldendict.org/&quot;&gt;веб сајту&lt;/a&gt;.&lt;p&gt;© Константин Исаков (ikm@goldendict.org), 2008-2011. Лиценца: GNU GPLv3 или новија.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Прошири чланак</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Скупи чланак</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Добро дошли у &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Ако покренете програм по први пут, одредите путању до речника у &lt;b&gt;Уреди|Речник&lt;/b&gt;. Ту можете да наведете разне сајтове Википедије или другe изворe података, подесите редослед у коме су речници или направите речник.&lt;p&gt;Након тога, можете да почнете да тражите речи. Речи се могу наћи у левом окну прозора. Када радите у другим апликацијама, можете да тражите речи, користећи &lt;a href=&quot;Рад са искачућим прозором&quot;&gt;искачући прозор&lt;/a&gt;. &lt;p&gt;У изборнику &lt;b&gt;Уреди|Поставке&lt;/b&gt;.Можете да подесите апликацију по свом укусу. Сви параметри су наговештаји који се приказују када пређете преко њих. Обратите пажњу на њих, када имате проблема са конфигурацијом.&lt;p&gt;Ако вам је потребна помоћ,било каква питања, захтеве, итд, погледајте&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt; Форум програма&lt;/a&gt;.&lt;p&gt;Ажурирање софтвера доступно на  &lt;a href=&quot;http://goldendict.org/&quot;&gt;веб сајту&lt;/a&gt;.&lt;p&gt;© Константин Исаков (ikm@goldendict.org), 2008-2011. Лиценца: GNU GPLv3 или новија. {3 ?} {3&gt;?} {2008-2013 ?} {3 ?}</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Рад са искачућим прозором</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Искачући прозор&lt;/h3&gt;Да бисте пронашли речи из друге апликације, потребно је да укључите &lt;i&gt;«Омогући искачући прозор»&lt;/i&gt; у &lt;b&gt;Поставке&lt;/b&gt; и након тога омогућити искачуће дугме «Прегледај» у главном прозору или у пливајућем изборнику на икони у системској палети.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Сада померите курсор на било коју реч и појавиће се искачући прозор са преводом или описом речи.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Сада изаберите реч у додатку (Дупли клик, или држећи миша преко њих док држите леви тастер), и искаче прозор са преводом или описом речи.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(без имена)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(слика)</translation>
     </message>
@@ -113,37 +113,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Прошири чланак</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Из: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Скупи чланак</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Упит грешке: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Затвори речи: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Сложени изрази: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Поједине речи: </translation>
     </message>
@@ -151,17 +151,17 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Ресурс</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Одређење: %1</translation>
     </message>
@@ -170,139 +170,140 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Изаберите тренутни чланак</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Умножи као текст</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Прегледај</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS глас</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Слика</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Видео: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Дефиниција из речника &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Тражени ресурс није пронађен.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Одређени аудио програм није пронађен.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Отворите ову везу</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Отворите ову везу у новој &amp;картици</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Отворите ову везу у спољнем &amp;прегледачу</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Сачувај &amp;слику...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Сачувај з&amp;вук...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Претражи &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Претражи «%1» у &amp;новој картици</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Пошаљи &quot;%1&quot; на ред за унос</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Додај &quot;%1&quot; у историју</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Претражи «%1» у %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Претражи «%1» у %2 в &amp;новој картици</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Сачувај звук</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Звучне датотеке (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Све датотеке (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Сачувај слику</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Сликовне датотеке (*.bmp *.jpg *.png *.tif);;Све датотеке (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>УПОЗОРЕЊЕ: FFmpeg Audio Player: %1</translation>
     </message>
@@ -315,27 +316,27 @@
         <translation type="obsolete">Да бисте омогућили могућност да репродукујете датотеке типа, различитих од WAV, посетите Уреди|Поставке, изаберите картицу Аудио, а затим изаберите &quot;излаз звука преко DirectShow&quot;.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Није могуће пустити аудио датотеку: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Није успело да створи привремену датотеку.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Грешка при отварању ресурс датотеке, покушајте ручно да отворите: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Није могуће учитати повезане ресурсе.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ОПРЕЗ: %1</translation>
     </message>
@@ -345,42 +346,44 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Претражи:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Претходно</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Следеће</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Мала и велика слова </translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Истакни &amp;све</translation>
     </message>
@@ -406,6 +409,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Лозинка:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -506,6 +532,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Текстуалне датотеке (*.txt);;Све датотеке (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Откажи</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -548,6 +687,16 @@
         <translation>Опис:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -564,6 +713,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Укључено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Назив</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Адреса</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Икона</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -585,17 +802,22 @@
         <translation>Уреди ову групу</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Подаци о речнику</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Отвори фасциклу речника</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Уреди речник</translation>
     </message>
@@ -603,39 +825,39 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Извори</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Речници</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Групе</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Извори промена</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Неки извори су промењени. Прихвати измене?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Прихвати</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Откажи</translation>
     </message>
@@ -654,6 +876,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Ништа</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Ништа</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -692,6 +1000,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Откажи</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -731,43 +1098,53 @@
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Додај групу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Унесите име нове групе:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Преименуј групу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Унесите ново име групе:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Уклоните групу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Желите да уклоните групу &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Уклоните све групе</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Уклоните све групе?</translation>
     </message>
@@ -868,6 +1245,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Напред</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Увећај</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Умањи</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Уобичајена величина</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -898,12 +1323,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Предлога за правопис: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 (морфологија)</translation>
     </message>
@@ -911,12 +1336,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Укључено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
@@ -1956,7 +2381,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Грешка при учитавању</translation>
     </message>
@@ -1964,7 +2389,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Грешка у поставци датотеке. Наставити са подразумеваним подешавањима?</translation>
     </message>
@@ -1976,78 +2401,84 @@
         <translation type="obsolete">Навигација</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Напред</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Прегледај</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Прикажи &amp;главни прозор</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>И&amp;злаз</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Учитавање...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Прескочи ову верзију</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Сакрили сте главни мени. Да га вратите, користите %1.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Подешавање странице</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Нема доступног тампач. Молимо вас, инсталирајте прво.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Штампај чланак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Чланак, целовит (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Чланак, само HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Сачувајте овај чланак као</translation>
     </message>
@@ -2056,44 +2487,44 @@
         <translation type="obsolete">Датотека Html (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Није могуће сачувати чланак: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>Речник: %1, чланци: %2, речи: %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Није успело да покрене механизам надгледања пречица.&lt;br&gt;Проверите да ли ваш XServer подржава проширење RECORD.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Доступна је нова верзија</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Издање &lt;b&gt;%1&lt;/b&gt; програма GoldenDict доступно је за преузимање.&lt;br&gt;
 Притисни &lt;b&gt;Преузми&lt;/b&gt;, да оде на страницу за преузимање.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Преузми</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Претражи у:</translation>
     </message>
@@ -2106,184 +2537,189 @@
         <translation type="obsolete">Прикажи мале иконе на траци са алаткама</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>Главни мени</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Пронађено у речницима:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Изговори реч (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Прикажи називе у картици &amp;речника</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Прикажи малу икону у &amp;алатној траци</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Навигација</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Увећај</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Умањи</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Уобичајена величина</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Увећај листу речи</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Умањи листу речи</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Уобичајена величина слова</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Затвори тренутну картицу</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Затворите све картице</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Затворите све картице осим тренутне</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Приступачност API није омогућено</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Претражи:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Све</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Чување чланка...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Главни прозор је подешен да увек буде на врху.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Сакривен</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Извоз историе у датотеку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Текстуалне датотеке (*.txt);;Све датотеке (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Извоз историје је завршен</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Извоз грешке:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Увоз историје из датотеке</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Увоз грешке: неважећи подаци у датотеци</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Увоз историје је завршен</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Грешка при увозу:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Подаци о речнику</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Отвори фасциклу речника</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Уреди речник</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Отворених картица</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Отвори листу картица</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(неименован)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2297,22 +2733,22 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Добро дошли!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Датотека</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Уреди</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Пимоћ</translation>
     </message>
@@ -2321,27 +2757,27 @@
         <translation type="obsolete">&amp;Речници...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Поставке...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Приказ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Увећај</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Историјат</translation>
     </message>
@@ -2350,169 +2786,199 @@
         <translation type="obsolete">Окно навигације за резуктате</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Претражи окно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Резултати окна за навигацију</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Окно историје</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Речници...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Почетна страница</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;О програму</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>О GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Затворите апликацију</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Форум</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Умањи у палету</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Умањи прозор у палету</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Сачувајте овај чланак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Сачувајте овај чланак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Штампај</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>П&amp;оставке странице</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Преглед пре шта&amp;мпања</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Поново прегледа датотеке</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Нова картица</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Прикажи</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Извоз</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Увоз</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Увек на врху</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Увек на врху</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Дугме изборника</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Преглед пре штампања</translation>
     </message>
@@ -2521,27 +2987,27 @@
         <translation type="obsolete">Поново прегледа датотеке</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>О&amp;чисти</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Нова картица</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>Фастикла подешавања</translation>
     </message>
@@ -2553,12 +3019,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Речник датотека је покварен или оштећен</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Неуспешно учитавање чланка из %1, разлог: %2</translation>
     </message>
@@ -2566,7 +3032,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Анализа грешке XML: %1 у %2, колони %3</translation>
     </message>
@@ -2574,7 +3040,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Анализа грешке XML: %1 у %2, колони %3</translation>
     </message>
@@ -2582,22 +3048,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Укључено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Икона</translation>
     </message>
@@ -2610,88 +3076,94 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Редослед речника:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Неактиван (онемогућени) речници:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Информације о речнику</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Укупно чланака:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Укупно речи:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Изворни језик:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Циљни језик:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Датотеке које чине речник:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Промена редоследа речника, превлачењем миша. Да бисте онемогућили речник превуците га на дно неактивне групе.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Разврстај по имену</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Разврстај по језицима</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Путања</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Рекурзивно</translation>
     </message>
@@ -2803,13 +3275,13 @@
         <translation>Преведи изабрану реч дуплим кликом</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Укључите или не укључити искачући прозор када програм почиње.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2825,27 +3297,27 @@
 тога, како би се реч издвојила.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Пречице</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Користите следећу пречицу за приказивање/сакривање главног прозора:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Користите следећу пречицу за превођење речи из оставе:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Пречице су глобалне и раде за сваки програм и све контексте, све док GoldenDict ради у позадини.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Искачући прозор</translation>
     </message>
@@ -2898,17 +3370,22 @@
         <translation>Ctrl-Tab навигација картица у MRU редоследу</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Подесите ову вредност да бисте избегли огромне падајуће изборнике</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Ограничи падајући изборник речника:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2919,134 +3396,134 @@
 искључите из главног прозора или иконице.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Омогући искачући прозор</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Омогући искачући прозор при покретању</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Овим је омогућено, искакање би се појавило ако су сви тастери изабрани
 у притиснутом стању, када се избор речи промени.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Само покажи искакање када сви одабрани тастери су непрестано притиснути:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Само леви Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Леви Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Само десни Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Десни Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Тастер Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Тастер Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Само леви Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Леви Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Тастер Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Само десни Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Десни Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Само десни Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Десни Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Само леви Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Леви Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Тастер Windows или Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win или Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Тастери могу бити накнадно притиснути, у оквиру</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3055,54 +3532,89 @@
 временског периода, који је овде одређен.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Пошаљите преведену реч на главни прозор уместо да га прикаже у искачућем прозору</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Пошаљите преведену реч у главни прозор</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Пусти звучне датотеке преко FFmpeg(libav) и libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Користи уграђени пуштач</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Неки сајтови откривају GoldenDict преко HTTP заглавља и блок захтева.
 Омогућите ову могућност да бисте решили тај проблем.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Немојте да идентификујете GoldenDict у HTTP заглављима</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Напредно</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Додатне методе за одређивање речи под курсором</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3113,12 +3625,12 @@
 Ако не користите такве програме не треба да укључи ову опцију.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Користи &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3127,12 +3639,12 @@
 Ако не користите такве програме не треба да укључи ову опцију.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Користи &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3141,87 +3653,87 @@
 Ако не користите такве програме да укључи ову опцију не треба.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Користи захтев &amp;GoldenDict</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Историјат</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Укључите ову могућност за чување историје преведених речи</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Складиште &amp;историје</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Одредите највећи број ставки задржат у историји</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Максимална величина историје:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Раздобље чувања историје. Ако се подеси на 0 у историји ће бити сачувана само током излаза.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Сачувај сваких</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>минута</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Чланци</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Укључите ову могућност да увек прошири необавезне делове чланака</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Могућност проширења &amp;делова</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Изаберите ову могућност да бисте аутоматски урушити велике чланке</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Уруши чланке опширније од</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Чланци дужи него ове величине ће бити срушени</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>симболи</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3234,27 +3746,27 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Напомена: Чини се да користите верзију X.Org XServer, у којој не постоји подршка за проширење RECORD. Вероватно пречице GoldenDict не раде. Овај проблем би требало да буде исправљен на страни XServer. За више информација погледајте &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug entry&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; а ако желите, поставите своје коментаре.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аудио</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Изговор</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Аутоматски изговари речи у главном прозору</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Аутоматски изговорити речи у искачућем прозору</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Репродукција</translation>
     </message>
@@ -3279,59 +3791,59 @@
         <translation type="obsolete">Репродукуј преко Phonon</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Користите неку спољну апликацију за репродукцију аудио датотека</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Користи спољни програм:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Мрежа</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Омогући ако користите прокси сервер
 за све мрежне захтеве програма.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Користи прокси-сервер</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Сервер:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Корисничко име:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Лозинка:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3341,12 +3853,12 @@
 због ове функције, покушајте да онемогућите ову опцију.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Онемогући учитавање садржаја са других сајтова (уклања већи део оглашавања)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3355,12 +3867,12 @@
 Да би ово функционисало, додатке треба инсталирати.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Омогући додатаке сајтовима</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3373,42 +3885,43 @@
 са сајта.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Проверите нову верзију</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Систем - подразумевано</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Подразумевано</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Модеран</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3417,12 +3930,12 @@
         <translation type="obsolete">Репродукуј преко DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Промена језика</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Поново покрените програм за промену језика.</translation>
     </message>
@@ -3430,27 +3943,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>По префиксима</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
@@ -3476,27 +3989,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Укључено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Командна линија</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Икона</translation>
     </message>
@@ -3504,12 +4017,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Грешка при учитавању чланка</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Грешка декодирања чланка</translation>
     </message>
@@ -3620,18 +4135,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2202"/>
-        <location filename="../articleview.cc" line="2209"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2202"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Грешка чувања ресурса: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2209"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Није могуће учитати повезане ресурсе.</translation>
     </message>
@@ -3639,12 +4154,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Хепберн Ромаји (Хирагана)</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Хепберн Ромаји (Катакана)</translation>
     </message>
@@ -3677,59 +4192,59 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Напред</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Изговори реч (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Пошаљите реч у главни прозор (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Приказивање или скривање траке речника</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Кликните да усидрите прозор на екрану, промените величину
 или било које друге особине.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3737,17 +4252,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Путања</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Икона</translation>
     </message>
@@ -3755,45 +4270,47 @@
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Текст у говор</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(није доступан у преносној верзији)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Изабери фасциклу</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Потврди уклањање</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Уклони фасциклу &lt;b&gt;%1&lt;/b&gt; из списка?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Уклони сајт &lt;b&gt;%1&lt;/b&gt; из списка?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Уклони програм &lt;b&gt;%1&lt;/b&gt; из списка?</translation>
     </message>
@@ -3812,7 +4329,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Додај...</translation>
     </message>
@@ -3821,7 +4339,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Уклони</translation>
     </message>
@@ -3892,7 +4411,7 @@
         <translation type="obsolete">Такође је могуће користити %GD1251% за кодирање CP1251, %GDISO1% за ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Програми</translation>
     </message>
@@ -3901,27 +4420,27 @@
         <translation type="obsolete">Сваки екстерни програм. Низ %GDWORD% ће бити замењена траженом речју. Иста реч ће бити послата у стандардни улазни ток.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Уживо изговор са сајта &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Овај сајт омогућава корисницима да снимају и деле изговорене речи. Можете да их слушам из GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Укључи изговор из Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Кључ API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3949,84 +4468,94 @@
 %GDBIG5% за Big-5, %GDBIG5HKSCS% за Big5-HKSCS, %GDGBK% за GBK и GB18030, %GDSHIFTJIS% за Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Неки спољни програми. Низ %GDWORD% биће замењен речју упита. Ако такав низ није представљен, реч ће се учитати у стандардни улаз.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Набавите свој кључ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, или оставите празно да бисте користили подразумевани.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Листа језичких кодова (раздвојене зарезима):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Листа кодова за језике које желите да користите. Пример: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Комплетан списак језичких кодова је доступан &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;овде&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Транслитерација</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Транслитерација (Руски)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Транслитерација (Грчки)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Транслитерација (Немачки)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Белоруска транслитерација</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Омогућава коришћење латинице за писање јапанског</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Ромаји (Јапански)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Системи:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Најпопуларнији метод преписивања Јапанског је,
 заснован на енглеској фонологији</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Хепберн</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4037,12 +4566,12 @@
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4053,32 +4582,32 @@
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Слоговна азбука:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Слоговна азбука &quot;Хирагана&quot;</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Хирагана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Слоговна азбука &quot;Катакана&quot;</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Катакана</translation>
     </message>
@@ -4219,22 +4748,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Укључено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Икона</translation>
     </message>
@@ -4242,7 +4771,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Претрага није успео у неким речницима.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/sv_SE.ts goldendict-1.5.0~git20150923/locale/sv_SE.ts
--- goldendict-1.5.0~git20131003/locale/sv_SE.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/sv_SE.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Okänd]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Baserat på Qt %1 (%2, %3 bitar)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Ingen översättning för &lt;b&gt;%1&lt;/b&gt; hittades i gruppen &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Ingen översättning hittades i gruppen &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Välkommen!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Visa artikel</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Dölj artikel</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Välkommen till &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;För att komma igång med programmet måste du först gå till &lt;b&gt;Redigera|Ordlistor&lt;/b&gt; för att lägga till mappsökvägar där programmet skall söka efter dina ordlistefiler. Där kan du även konfigurera olika Wikipedia-webbplatser eller andra källor, ändra ordning på ordlistor och skapa ordlistegrupper.&lt;p&gt;När det är avklarat kan du börja slå upp ord! Du kan göra detta i det här fönstret genom att använda sökpanelen till vänster, eller genom att &lt;a href=&quot;Arbeta med popuprutor&quot;&gt;slå upp ord inifrån andra öppna program&lt;/a&gt;. &lt;p&gt;Vill du anpassa programmet hittar du alla tillgängliga inställningsalternativ i &lt;b&gt;Redigera|Inställningar&lt;/b&gt;. Alla inställningar där har verktygstips, läs dem om det är något du undrar över.&lt;p&gt;Om du behöver ytterligare hjälp, behöver ställa en fråga, har förslag eller bara undrar vad andra tycker, så är du välkommen till programmets &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Gå till programmets &lt;a href=&quot;http://goldendict.org/&quot;&gt;webbplats&lt;/a&gt; för att hitta uppdateringar. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensierat under GNU GPLv3 eller senare.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Arbeta med popuprutor</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Arbeta med popuprutor&lt;/h3&gt;För att slå upp ord inifrån andra öppna program, så måste du först aktivera alternativet &lt;i&gt;&quot;Använd sökning med popupruta&quot;&lt;/i&gt; i &lt;b&gt;Inställningar&lt;/b&gt;. Därefter kan du slå på/stänga av funktionen vid behov genom att antingen klicka på popuprutefunktionens ikon här ovan eller genom att högerklicka på ikonen i meddelandefältet och välja alternativet i menyn som visas. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Håll sedan muspekaren över det ord som du vill slå upp i det andra programmet, så visas en popupruta med sökresultat från de ordlistor du använder.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Använd sedan musen för att markera det ord som du vill slå upp i det andra programmet (dubbelklicka eller klicka och dra med musknappen nedtryckt), så visas en popupruta med sökresultat från de ordlistor du använder.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(namnlös)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(bild)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Visa artikel</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Från </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Dölj artikel</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Frågefel: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Närliggande ord: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Sammansättningar: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Enskilda ord: </translation>
     </message>
@@ -148,219 +148,222 @@
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Sök:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Föregående</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Nästa</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Skiftlägeskänslig</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Färgmarkera &amp;alla</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Markera aktuell artikel</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Kopiera som oformaterad text</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Granska källkod</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Resurs</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Text till tal-modul</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Bild</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Video: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Definition ur ordlistan &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Definition: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Den refererade resursen finns inte.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Det refererade ljudprogrammet finns inte.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>FEL: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Spara ljud</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Ljudfiler (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Alla filer (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Spara bild</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Bildfiler (*.bmp *.jpg *.png *.tif);;Alla filer (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>Öppna &amp;länk</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Öppna länk i ny &amp;flik</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Öppna länk i extern &amp;webbläsare</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Spara &amp;bild …</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Spara l&amp;jud …</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Slå upp &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Slå upp &quot;%1&quot; i &amp;ny flik</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Skicka &quot;%1&quot; till sökfältet</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Lägg till &quot;%1&quot; i historiken</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Slå upp &quot;%1&quot; i %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Slå upp &quot;%1&quot; i %2 i &amp;ny flik</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>VARNING: Ljudspelare för FFmpeg: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>VARNING: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Det gick inte att köra en spelare när en ljudfil skulle spelas upp: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Det gick inte att skapa en tillfällig fil.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Det gick inte att automatiskt öppna en resursfil. Försök att öppna den manuellt: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Det gick inte att hämta den refererade resursen.</translation>
     </message>
@@ -386,6 +389,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Lösenord:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -486,6 +512,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Textfiler (*.txt);;Alla filer (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Avbryt</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -528,6 +667,16 @@
         <translation>Beskrivning:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -544,6 +693,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Aktiverad</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Namn</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Adress</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Ikon</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <location filename="../dictionarybar.cc" line="15"/>
@@ -561,17 +778,22 @@
         <translation>Redigera denna grupp</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Ordlisteinformation</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Öppna ordlistans lagringsmapp</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Redigera ordlista</translation>
     </message>
@@ -584,39 +806,39 @@
         <translation>Ordlistor</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Källor</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Ordlistor</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Grupper</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Källor har ändrats</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Några källor har ändrats. Godkänner du ändringarna?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Godkänn</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -630,6 +852,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Ingen</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Ingen</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -668,6 +976,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -798,7 +1165,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Ta bort alla grupper</translation>
     </message>
@@ -809,42 +1176,100 @@
         <translation>Använd musen för att dra och släppa ordlistor till och från grupperna, ändra ordlistornas ordning inom grupperna samt ändra gruppernas inbördes ordning.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Lägg till grupp</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Ange ett namn på den nya gruppen:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Byt namn på grupp</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Ange ett nytt namn på gruppen:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Ta bort grupp</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Är du säker på att du vill ta bort gruppen &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Är du säker på att du vill ta bort alla grupper?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Bakåt</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Framåt</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Zooma in</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Zooma ut</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normal storlek</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -875,12 +1300,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Stavningsförslag: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Morfologi för %1</translation>
     </message>
@@ -888,12 +1313,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Aktiverad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
@@ -1933,7 +2358,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Fel vid inläsning av ordlistorna</translation>
     </message>
@@ -1941,7 +2366,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Fel i konfigurationsfilen. Vill du använda standardinställningarna istället?</translation>
     </message>
@@ -1950,534 +2375,575 @@
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Välkommen!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Zooma</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Sökpanel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Resultatpanel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Historikpanel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Ordlistor …</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Inställningar …</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Webbplats</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Om</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Om GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Avslutar programmet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Stäng till meddelandefältet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Minimerar programfönstret till meddelandefältet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Spara artikel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Spara artikel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>Skriv &amp;ut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Utskrifts&amp;format</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Förhands&amp;granska</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>Sök igenom filer &amp;igen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Ny flik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Alltid överst</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Alltid överst</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Menyknapp</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Rensa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Ny flik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Konfigurationsfilmapp</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportera</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Importera</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Menyrad</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Visa namn i ordliste&amp;fältet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Visa små ikoner i &amp;verktygsfält</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigeringsfältet</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Bakåt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Framåt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Sökpopupruta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Läs upp ord (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Zooma in</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Zooma ut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Normal storlek</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Slå upp i:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Träffar hittades i följande ordlistor:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Zooma in ord</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Zooma ut ord</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Normal storlek på ord</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Visa &amp;huvudfönstret</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Öppnade flikar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Stäng aktuell flik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Stäng alla flikar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Stäng alla flikar utom aktuell flik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Läser in …</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 ordlistor, %2 artiklar, %3 ord</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Slå upp:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Öppna lista över flikar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(namnlös)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Det gick inte att initiera övervakningsmekanismen för kortkommandon.&lt;br&gt;Säkerställ att tillägget RECORD för din XServer är aktiverat.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Ny version tillgänglig</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Version &lt;b&gt;%1&lt;/b&gt; av GoldenDict finns nu tillgänglig för hämtning.&lt;br&gt;Klicka på &lt;b&gt;Hämta&lt;/b&gt; för att gå till hämtningssidan.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Hämta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Hoppa över denna version</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>API för hjälpmedel har inte aktiverats</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Du har valt att dölja en menyrad. Använd %1 för att visa den igen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Utskriftsformat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Inga tillgängliga skrivare. Du måste installera eller ansluta dig till en.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Skriv ut artikel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Artikel, fullständig (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Artikel, endast HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Spara artikel som</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Det gick inte att spara artikeln: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Sparar artikel …</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Huvudfönstret har ställts in att alltid ligga överst.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Dölj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Exportera historik till fil</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Textfiler (*.txt);;Alla filer (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Historiken har exporterats</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Fel vid export: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Importera historik från fil</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Fel vid import: felaktiga data i fil</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Historiken har importerats</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Fel vid import: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Information om ordlista</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Öppna ordlistans mapp</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Redigera ordlista</translation>
     </message>
@@ -2485,12 +2951,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Ordlistefilen har manipulerats eller är skadad</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Det gick inte att läsa in en artikel från %1, orsak: %2</translation>
     </message>
@@ -2498,7 +2964,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML-tolkningsfel: %1 på %2, %3</translation>
     </message>
@@ -2506,7 +2972,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML-tolkningsfel: %1 på %2, %3</translation>
     </message>
@@ -2514,22 +2980,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Aktiverad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adress</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Ikon</translation>
     </message>
@@ -2542,88 +3008,94 @@
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Ordlisteordning:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>…</translation>
+        <translation type="obsolete">…</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Inaktiverade ordlistor:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Information om ordlista</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Antal artiklar:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Antal ord:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Källspråk:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Målspråk:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Beskrivning:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Filer som omfattas av ordlistan:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Ändra ordningen genom att dra och släppa objekten i listan. Släpp ordlistor i gruppen &quot;Inaktiverade ordlistor&quot; för att inaktivera dem.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Sortera efter namn</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Sortera efter språk</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Sökväg</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Rekursiv</translation>
     </message>
@@ -2782,22 +3254,27 @@
         <translation>Tilläggsformat:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Justera detta värde för att undvika alltför stora snabbmenyer.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Högsta antal ordlistor i snabbmenyer:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Sökpopupruta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2808,136 +3285,136 @@
 och stängas av från huvudfönstret eller ikonen i meddelandefältet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Aktivera sökpopuprutefunktionen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Avgör om sökpopuprutelägets standardinställning är PÅ eller AV. Om kryss-
 rutan är markerad startar programmet alltid med sökpopuprutan påslagen.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Starta med sökpopuprutan påslagen</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>När alternativet är aktiverat visas sökpopuprutan endast om alla de
 angivna tangenterna är nedtryckta när ordet markeras.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Visa endast sökpopuprutan när följande tangenter hålls nedtryckta:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Endast vänster Ctrl-tangent</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Vänster Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Endast höger Skift-tangent</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Höger Skift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt-tangenten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Ctrl-tangenten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Endast vänster Alt-tangent</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Vänster Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Skift-tangenten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Skift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Endast höger Alt-tangent</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Höger Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Endast höger Ctrl-tangent</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Höger Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Endast vänster Skift-tangent</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Vänster Skift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows- eller Meta-tangenten</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -2949,12 +3426,12 @@
 markerats.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Tillåt att tangenter trycks ned efter markering, inom</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2963,42 +3440,42 @@
 efter slutförd markering. Här anges den tidsperioden.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Skicka översatta ord till huvudfönstret istället för att visa dem i popuprutan.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Skicka översatta ord till huvudfönstret</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Kortkommandon</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Använd följande kortkommando för att visa eller dölja huvudfönstret:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Använd följande kortkommando för att översätta ett ord från Urklipp:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Kortkommandona är globala och fungerar inifrån alla program och i alla sammanhang, förutsatt att GoldenDict körs i bakgrunden.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3011,77 +3488,112 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Obs: Det verkar som att du kör en XServer-version (från X.Org) vars tillägg &lt;b&gt;Record&lt;/b&gt; är skadat. Kortkommandon kommer antagligen inte att fungera i GoldenDict. Problemet måste åtgärdas i själva servern. Gå till följande &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;buggrapport&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; och lämna en kommentar där om du så önskar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>L&amp;jud</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Text till tal</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Läs automatiskt upp ord i huvudfönstret</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Läs automatiskt upp ord i popuprutan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Uppspelning</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Spela upp ljudfiler via FFmpeg(libav) och libao.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Använd intern spelare</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Välj detta alternativ för att automatiskt dölja stora artiklar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Dölj artiklar längre än</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Artiklar som är längre än följande antal tecken kommer att komprimeras.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>tecken</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Använd ett externt program för att spela upp ljudfiler.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Använd externt program:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Nätverk</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Aktivera detta alternativ om du vill använda
@@ -3089,37 +3601,37 @@
 förfrågningar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Använd proxyserver</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Värd:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Användare:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3129,12 +3641,12 @@
 webbplats slutar fungera p.g.a. det här, testa att inaktivera alternativet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Blockera inläsning av innehåll från andra webbplatser (döljer merparten av annonserna)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3144,12 +3656,12 @@
 detta alternativ skall fungera.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Aktivera webbinsticksmoduler</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Vissa webbplatser identifierar GoldenDict m.h.a. HTTP-huvuden och
@@ -3157,12 +3669,12 @@
 det problemet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Identifiera inte GoldenDict i HTTP-huvuden</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3175,22 +3687,22 @@
 saken och ber denna att öppna en hämtningssida.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Sök med jämna mellanrum efter nya programversioner</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>A&amp;vancerat</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Ytterligare teknologier för sökpopuprutan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3201,12 +3713,12 @@
 sådana program, så behöver du inte aktivera det här alternativet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Använd &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3216,12 +3728,12 @@
 du inte aktivera det här alternativet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Använd &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3231,107 +3743,108 @@
 du inte aktivera det här alternativet.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Använd &amp;GoldenDict-meddelande</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Historik</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Aktivera detta alternativ för att lagra en historik över översatta ord.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Lagra &amp;historik</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Ange det maximala antalet poster som får behållas i historiken.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Största historikstorlek:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Sparintervall för historiken. Ange till 0 för att endast  spara historiken vid programavslut.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Spara var</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minut</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Artiklar</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Aktivera detta alternativ för att alltid visa valfria delar av artiklar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Visa valfria &amp;delar</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Systemstandard</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modernt</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes (blå)</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Språkbyte</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Starta om programmet för att verkställa bytet av språk.</translation>
     </message>
@@ -3339,27 +3852,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Oformaterad text</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Prefixmatchning</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Okänd</translation>
     </message>
@@ -3385,27 +3898,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Aktiverad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Kommandorad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Ikon</translation>
     </message>
@@ -3413,12 +3926,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Artikelinläsningsfel</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Artikelavkodningsfel</translation>
     </message>
@@ -3529,18 +4044,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>FEL: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Fel när resurs skulle sparas: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Det gick inte att hämta den refererade resursen.</translation>
     </message>
@@ -3548,12 +4063,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Romanisering för hiragana enl. Hepburn-systemet</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Romanisering för katakana enl. Hepburn-systemet</translation>
     </message>
@@ -3574,59 +4089,59 @@
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Bakåt</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Framåt</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Läs upp ord (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Skicka ord till huvudfönstret (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Visar/döljer ordlistefältet</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Klicka här för att nåla fast rutan så att den stannar kvar på skärmen.
 Rutan kan storleksändras och hanteras på andra sätt.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3634,17 +4149,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Sökväg</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Ikon</translation>
     </message>
@@ -3666,7 +4181,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Lägg till …</translation>
     </message>
@@ -3675,7 +4191,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>Ta &amp;bort</translation>
     </message>
@@ -3750,32 +4267,32 @@
         <translation>Ange de webbplatser du vill använda. Strängen %GDWORD% ersätts av sökordet vid sökning:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Program</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Uppläsning av ord från &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;, en webbplats som låter människor spela in och dela uttal av ord. Du kan lyssna på inspelningarna inifrån GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Aktivera orduppläsningar från Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API-nyckel:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3785,7 +4302,7 @@
 dig på webbplatsen för att få din egen nyckel.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Skaffa en egen nyckel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;här&lt;/a&gt; eller lämna fältet tomt för att använda standardnyckeln.</translation>
     </message>
@@ -3797,79 +4314,89 @@
 %GDBIG5% för Big5, %GDBIG5HKSCS% för Big5-HKSCS, %GDGBK% för GBK och GB18030, samt %GDSHIFTJIS% för Shift JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Ange de program du vill använda. Strängen %GDWORD% ersätts av sökordet. Om strängen inte finns kommer sökordet att matas in som standardindata.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Språkkoder:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Lista över språkkoder för de som du vill ha tillgång till. Exempel: &quot;en, fr, sv&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Avgränsa språkkoderna med kommatecken. En fullständig lista över språkkoder finns tillgänglig &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;här&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Translitterering</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Translitterering av ryska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Translitterering av grekiska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Translitterering av tyska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Translitterering av vitryska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Låter dig använda det latinska alfabetet för att skriva på japanska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Romanisering av japanska</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>System:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Den mest utbredda metoden för transkribering av japanska,
 baserad på engelsk fonologi.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3880,12 +4407,12 @@
 Har ännu inte implementerats i  GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3896,75 +4423,77 @@
 Har ännu inte implementerats i  GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Stavelseskrifter:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Den japanska stavelseskriften hiragana.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Den japanska stavelseskriften katakana.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Text till tal</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(inte tillgängligt i den portabla versionen)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Välj en mapp</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Bekräfta borttagning</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Vill du ta bort mappen &lt;b&gt;%1&lt;/b&gt; ur listan?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Vill du ta bort webbplatsen &lt;b&gt;%1&lt;/b&gt; ur listan?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Vill du ta bort programmet &lt;b&gt;%1&lt;/b&gt; ur listan?</translation>
     </message>
@@ -4094,22 +4623,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Aktiverad</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adress</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Ikon</translation>
     </message>
@@ -4117,7 +4646,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Det gick inte att fråga några av ordlistorna.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/tg_TJ.ts goldendict-1.5.0~git20150923/locale/tg_TJ.ts
--- goldendict-1.5.0~git20131003/locale/tg_TJ.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/tg_TJ.ts	2015-09-23 08:26:24.000000000 +0000
@@ -34,7 +34,7 @@
         <translation>[Номаълум]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Дар Qt %1 (%2, %3 бит) асос меёбад</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Баркушодани мақола</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Печондани мақола</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Ягон тарҷума барои &lt;b&gt;%1&lt;/b&gt; дар гурӯҳи &lt;b&gt;%2&lt;/b&gt; ёфт нашудааст.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Ягон тарҷума дар гурӯҳи &lt;b&gt;%1&lt;/b&gt; ёфт нашудааст.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Хуш омадед!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Хуш омадед ба луғати &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Барои оғози кор бо луғат, пеш аз ҳама ба &lt;b&gt;Танзимот|Луғатҳо&lt;/b&gt; гузаред ва файлҳои луғатҳои лозимиро илова кунед, сайтҳои Wikipedia ё сайтҳои дигарро насб кунед, тартиби луғатҳоро таъин кунед ё гурӯҳҳои луғатро эҷод кунед.&lt;p&gt;Баъд аз ин шумо метавонед калимаҳоро тарҷума кунед! Шумо метавонед калимаҳоро бо истифодаи лавҳаи чапи ин равзана тарҷума кунед, ё шумо метавонед &lt;a href=&quot;Тарҷума бо равзанаи пайдошаванда&quot;&gt;калимаҳоро дар барномаҳои дигар тарҷума кунед&lt;/a&gt;. &lt;p&gt;Барои насб кардани танзимоти шахсӣ, хусусиятҳои дастрасиро дар &lt;b&gt;Танзимот|Хусусиятҳо&lt;/b&gt; истифода баред. Ҳамаи танзимоти ин барнома дорои маслиҳат мебошанд. Агар ягон мушкилӣ дошта бошед, мутмаин шавед, ки он маслиҳатҳоро хонед.&lt;p&gt;Барои маълумоти муфассал, гирифтани кӯмак, ҷавобу саволҳо, маслиҳатҳо ё ҳалли масъалаҳои дигар, шумо метавонед &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;форуми луғатро&lt;/a&gt; истифода баред.&lt;p&gt;Барои гирифтани навсозиҳои барнома &lt;a href=&quot;http://goldendict.org/&quot;&gt;вебсайти луғатро&lt;/a&gt; истифода баред. &lt;p&gt;(c) 2008-2013 Константин Исаков. Иҷозатномаи GPLv3 ё навтар.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Тарҷума бо равзанаи пайдошаванда</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Тарҷума бо равзанаи пайдошаванда&lt;/h3&gt;Барои тарҷума кардани калимаҳо дар барномаҳои дигар, пеш аз ҳама шумо бояд &lt;i&gt;&quot;Хусусияти тарҷумаи пайдошавандаро&quot;&lt;/i&gt; дар &lt;b&gt;Хусусиятҳо&lt;/b&gt; фаъол кунед. Дар оянда шумо метавонед ин хусусиятро ба воситаи зеркунии тугмаи &quot;Тарҷумаи пайдошаванда&quot; фаъол кунед, ё шумо метавонед ин хусусиятро бо зеркунии нишонаи панел аз менюи пайдошуда фаъол кунед. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Баъд аз фаъол кардани хусусияти тарҷумаи пайдошаванда курсори мушро ба болои калимаи дилхоҳ ҷойгир кунед, ва равзана бо тарҷумаҳо бояд барои шумо пайдо шавад.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Баъд аз фаъол кардани хусусияти тарҷумаи пайдошаванда, калимаи дилхоҳро дар барномаи дигар бо нишондиҳандаи муш интихоб кунед (ба калимаи дилхоҳ дубора зер кунед) ва равзана бо тарҷумаҳо бояд барои шумо пайдо шавад.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(беном)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(тасвир)</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Баркушодани мақола</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Аз </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Печондани мақола</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Хатои дархост: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Калимаҳои наздик: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Ифодаҳои алоқадор: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Калимаҳои шахсӣ: </translation>
     </message>
@@ -148,82 +148,84 @@
         <translation>Шакл</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Ҷустуҷӯ:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Пешина</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Навбатӣ</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Аломатҳои хурду калон</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Ҳамаашро ҷу&amp;до кунед</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Манбаъ</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Овози TTS (Матн ба талаффуз)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Тасвир</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Видео: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Таъриф аз луғати &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Маъно: %1</translation>
     </message>
@@ -232,38 +234,39 @@
         <translation type="obsolete">Луғати GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Манбаъи ишорашуда вуҷуд надорад.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Барномаи аудиоии ишорашуда вуҷуд надорад.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ХАТОГӢ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Захира кардани садо</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Файлҳои садоӣ (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Ҳамаи файлҳо (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Захира кардани тасвир</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Файлҳои тасвирӣ (*.bmp *.jpg *.png *.tif);;Ҳамаи файлҳо (*.*)</translation>
     </message>
@@ -272,63 +275,63 @@
         <translation type="obsolete">Хатои захиракунии манбаъ: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Пайвандро кушодан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Пайвандро дар &amp;варақаи нав кушодан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Пайвандро дар &amp;браузер кушодан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Захира &amp;кардани тасвир...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Захира &amp;кардани садо...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&quot;%1&quot;-ро &amp;дарёфт кардан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>&quot;%1&quot;-ро дар варақаи &amp;нав дарёфт кардан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Фиристодани &quot;%1&quot; ба хати ворида</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Илова кардани &quot;%1&quot; ба таърих</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>&quot;%1&quot;-ро дар %2 дарёфт кардан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>&quot;%1&quot;-ро дар %2 дар варақаи &amp;нав дарёфт кардан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>ОГОҲӢ: Плеери аудиоии FFmpeg: %1</translation>
     </message>
@@ -349,42 +352,42 @@
         <translation type="obsolete">Китобхои басс ин садоро пахш карда наметавонад.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Барои иҷрои файли аудиоӣ кушоиши плеер қатъ карда шуд: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Эҷодкунии файли муваққатӣ қатъ карда шуд.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Кушоиши файл ба таври худкор қатъ карда шуд, кӯшиш кунед, ки онро ба таври дастӣ кушоед: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ОГОҲӢ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Интихоб кардани мақолаи ҷорӣ</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Нусха бардоштан ҳамчун матн</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Тафтиш кардан</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Боргирии манбаъи ишорашуда қатъ карда шуд.</translation>
     </message>
@@ -410,6 +413,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>Санҷиши ҳаққонияти прокси лозим аст</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>Барои пайдо кардани дастрасӣ тавассути прокси, шумо бояд номи корбар ва паролро ваорид кунед</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>Номи корбар:</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>Парол:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -510,6 +536,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>Ҳолати ҷустуҷӯ</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>Ин унсур муайян мекунад, ки чӣ тавр фитри сатр иҷро мешавад</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>Агар интихоб кунед, мавриди аломатҳо ҳангоми филтркунӣ ба ҳисоб гирифта мешавад</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>Мавриди мутобиқат</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>Калимаҳои аввалинро ба файл содир мекунад</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>Содир кардан</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>Барои татбиқ кардани филтр ба рӯйхати калимаҳои аввалин, ин тугмаро зер кунед</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>Татбиқ кардан</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>Агар интихоб кунед, тағйироти филтр ба рӯйхати калимаҳои аввалин дарҳол татбиқ карда мешавад</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>Табиқи худкор</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>Филтр:</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>Филтркунии сатрҳо (сатрҳои устувор, ифодаҳои оддӣ ва аломатҳои махсус)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>Матн</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>Аломатҳои махсус</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>Ифодаи оддӣ</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>Ҳамагӣ калимаҳои аввалини беҳамто: %1, филтршуда: %2</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>Захира кардани калимаҳои аввалин ба файл</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>Файлҳои матнӣ (*.txt);;Ҳамаи файлҳо (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>Содир кардани калимаҳои аввлин...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>Бекор кардан</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -552,6 +691,16 @@
         <translation>Тавсиф:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>Намоиш додани ҳамаи калимаҳои аввалини беҳамтои луғат</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>Калимаҳои аввалин</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -568,6 +717,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Фаъолшуда</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Ном</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Суроға</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -589,17 +806,22 @@
         <translation>Гурӯҳи зеринро таҳрир кардан</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Иттилооти луғат</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>Калимаҳои аввалини луғат</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Кушодани ҷузвдони луғат</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Таҳрир кардани луғат</translation>
     </message>
@@ -612,39 +834,39 @@
         <translation>Луғатҳо</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Сарчашмаҳо</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Луғатҳо</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Гурӯҳҳо</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Сарчашмаҳо тағйир дода шудаанд</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Баъзе сарчашмаҳо тағйир дода шудаанд. Шумо мехоҳед ин тағйиротро қабул кунед?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Қабул кардан</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Бекор кардан</translation>
     </message>
@@ -658,6 +880,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>Ҳеҷ</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>Ҷустуҷӯ дар тамоми матн</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>Калимаҳои пурра</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>Матни оддӣ</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>Аломатҳои махсус</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>Ифодаи оддӣ</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>Масофаи ҳадди аксар байни калимаҳо (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>Ҳадди аксари ифодаҳо дар ҳар як луғат (%1-%2):</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>Мақолаҳои ёфтшуда: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>Мураттабсозӣ: </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation>Хати ҷустуҷӯ бояд ақаллан як калимаро бо </translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation> ё якчанд аломатро дар бар гирад</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>Ягон луғат барои ҷустуҷӯи матни пурра вуҷуд надорад</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>Ҳеҷ</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -696,6 +1004,69 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>Ҷустуҷӯ</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>Мавриди мутобиқат</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>Ҳолат:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>Мақолаҳои ёфтшуда:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>Луғатҳои дастрас дар гурӯҳ:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>Дар ҳоли интизори мураттабсозӣ:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-indexable:</source>
+        <translation type="obsolete">Ғайри мураттаб:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>Ҳамагӣ:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>Мураттабшуда:</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>Мураттабсозӣ: Ҳеҷ</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>Бекор кардан</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -826,7 +1197,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Ҳамаи гурӯҳҳоро тоза кардан</translation>
     </message>
@@ -836,42 +1207,100 @@
         <translation>Луғатҳоро аз гурӯҳҳо ва ба гурӯҳҳо кашида монед, онҳоро дар дохили гурӯҳҳо таҳвил диҳед ва тартиби гурӯҳҳоро тав&amp;ассути муш иваз кунед.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation>Гурӯҳбандии варақаҳо</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>Кушодани рӯйхати гурӯҳҳо</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Гурӯҳро илова кардан</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Ба гурӯҳи нав ном гузоштан:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Номи гурӯҳро иваз кардан</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Ба гурӯҳ номи нав гузоштан:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Гурӯҳро тоза кардан</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Шумо мутмаин ҳастед, ки мехоҳед гурӯҳи &lt;b&gt;%1&lt;/b&gt;-ро тоза кунед?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Шумо мутмаин ҳастед, ки мехоҳед ҳамаи гурӯҳҳоро тоза кунед?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Ба қафо</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Ба пеш</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Бузург кардан</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Хурд кардан</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Андозаи муқаррарӣ</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -902,12 +1331,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Пешниҳоди санҷиши калима: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Морфологияи %1</translation>
     </message>
@@ -915,12 +1344,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Фаъолшуда</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Ном</translation>
     </message>
@@ -1960,7 +2389,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Ҳангоми боркунии луғатҳо хатогӣ ба вуҷуд омад</translation>
     </message>
@@ -1968,7 +2397,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Хатогӣ дар файли танзимӣ. Бо танзимоти пешфарз давом медиҳед?</translation>
     </message>
@@ -1981,37 +2410,37 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Хуш омадед!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Танзимот</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Кӯмак</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Намоиш</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Танзими андозаи шрифт</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Таърих</translation>
     </message>
@@ -2024,17 +2453,17 @@
         <translation type="obsolete">Лавҳаи натиҷаҳои ҷустуҷӯ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Лавҳаи ҷустуҷӯ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Лавҳаи натиҷаҳои ҷустуҷӯ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Лавҳаи таърих</translation>
     </message>
@@ -2043,149 +2472,179 @@
         <translation type="obsolete">&amp;Луғатҳо...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>Ҷустуҷӯ</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Луғатҳо...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Хусусиятҳо...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Вебсайти луғат</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Дар бораи барнома</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Дар бораи GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Баромад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Аз барнома баромадан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Форуми луғат</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Ба панҷараки огоҳиҳо печондан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Равзанаро ба панҷараки огоҳиҳо мепечонад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Мақоларо захира кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Мақоларо захира кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Чоп кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Танзими саҳифа</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>&amp;Пешнамоиши чоп</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Файлҳоро аз нав коркард кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Варақаи нав</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>Ҳамеша дар &amp;боло</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Ҳамеша дар боло</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Тугмаи меню</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>Ҷустуҷӯ дар саҳифа</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>Ҷустуҷӯ дар матни пурра</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Пешнамоиши чоп</translation>
     </message>
@@ -2194,48 +2653,48 @@
         <translation type="obsolete">Файлҳоро аз нав коркард кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Пок кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Варақаи нав</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Ҷузвдони танзимот</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Намоиш додан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Содир кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Ворид кардан</translation>
     </message>
@@ -2248,18 +2707,18 @@
         <translation type="obsolete">Дар наворҳои абзорҳо нишонаҳои хурдро намоиш додан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Лавҳаи меню</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Тарҷума дар:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Натиҷа дар луғатҳои зерин дарёфт шуд:</translation>
     </message>
@@ -2268,127 +2727,127 @@
         <translation type="obsolete">Лавҳаи идоракунӣ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Номҳоро дар &amp;лавҳаи луғат намоиш додан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Лавҳаи идоракунӣ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Ба қафо</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Ба пеш</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Тарҷумаи пайдошаванда</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Калимаро талаффуз кардан (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Бузург кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Хурд кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Андозаи муқаррарӣ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Калимаҳоро бузург кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Калимаҳоро хурд кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Андозаи муқаррарӣ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>&amp;Равзанаи асосиро намоиш додан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Варақаҳои кушодашуда</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Варақаи ҷориро пӯшидан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Ҳамаи варақаҳоро пӯшидан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Ҳамаи варақаҳоро ба ғайр аз ҷорӣ пӯшидан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Бор шуда истодааст...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 луғат, %2 мақола, %3 калима</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Тарҷума кардан:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Умумӣ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Рӯйхати варақаҳоро кушодан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(беном)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2397,73 +2856,80 @@
         <translation type="obsolete">ОГОҲӢ: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Омодасозии механизми назорати тугмаҳои зеркор қатъ карда шуд.&lt;br&gt;Мутмаин шавед, ки имконоти RECORD дар XServer фаъол аст.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Версияи барномаи нав дастрас аст</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Версияи навтарини луғати GoldenDict &lt;b&gt;%1&lt;/b&gt; барои боргирӣ дастрас аст.&lt;br&gt;Барои кушодани саҳифаи боргирии барнома, тугмаи &lt;b&gt;Боргириро&lt;/b&gt; зер кунед.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Боргирӣ кунед</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Ин версияро нодида гузарондан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>Қобилияти API фаъол нашудааст</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>Сатрҳое, ки дар луғатҳо ҷустуҷӯ карда мешаванд. Аломатҳои махсус &apos;*&apos;, &apos;?&apos; ма маҷмӯи аломатҳои &apos;[...]&apos; иҷозат дода намешаванд.
+Барои ёфтани аломатҳои &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos;, аз &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; истифода баред</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Шумо пинҳон кардани лавҳаи менюро интихоб кардед. Барои аз нав намоиш додани лавҳаи меню, %1-ро истифода баред.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Танзими саҳифа</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Ягон принтер дастрас нест. Пеш аз ҳама шумо бояд принтерро танзим кунед.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Мақоларо чоп кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Мақола, Пурра (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Мақола, танҳо HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Мақоларо захира кардан ҳамчун</translation>
     </message>
@@ -2472,27 +2938,27 @@
         <translation type="obsolete">Файлҳои html (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Хато</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Мақола захира нашуд: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Захиракунии мақола...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Равзанаи асосӣ ҳамеша дар боло ҷойгир мешавад.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Пинҳон кардан</translation>
     </message>
@@ -2501,28 +2967,28 @@
         <translation type="obsolete">Ҳолати намоиши таърих</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Таърихро ба файл содир кардан</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Файлҳои матнӣ (*.txt);;Ҳамаи файлҳо (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Содиркунии таърих ба анҷом расид</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Хатои содиркунӣ: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Ворид кардани таърих аз файл</translation>
     </message>
@@ -2531,32 +2997,37 @@
         <translation type="obsolete">Воридшуда аз файл:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Хатои воридот: маълумоти беэътибор дар файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Воридоти таърих ба анҷом расид</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Хатои воридот: </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Иттилооти луғат</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>Калимаҳои аввалини луғат</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Кушодани ҷузвдони луғат</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Таҳрир кардани луғат</translation>
     </message>
@@ -2564,12 +3035,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Файли луғат тағйир ёфт ё вайрон шуд</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Боркунии мақола аз %1 қатъ шуд; сабаб: %2</translation>
     </message>
@@ -2577,7 +3048,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Хатои таҳлили XML: %1 дар %2,%3</translation>
     </message>
@@ -2585,7 +3056,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Хатои таҳлили XML: %1 дар %2,%3</translation>
     </message>
@@ -2593,22 +3064,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Фаъолшуда</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Ном</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Суроға</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Аломат</translation>
     </message>
@@ -2621,89 +3092,95 @@
         <translation>Шакл</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Тартиби луғатҳо:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Луғатҳои ғайрифаъол (хомӯшшуда):</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Маълумоти луғат</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Ном:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Ҳамагӣ мақолаҳо:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Ҳамагӣ калимаҳо:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Тарҷума аз забони:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Тарҷума ба забони:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Тавсиф:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Файлҳои луғат:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translatorcomment> Ба воситаи ҷойгузин кардани объектҳо тартибро танзим намоед. Барои хомӯш кардани луғатҳо, онҳоро ба гурӯҳи ғайрифаъол интиқол диҳед.</translatorcomment>
         <translation> Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Мураттабсозӣ аз рӯи ном</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Мураттабсозӣ аз рӯи забон</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>Калимаҳои аввалини луғат</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Масир</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Фаъол/ғайрифаъол кардани луғат</translation>
     </message>
@@ -2862,22 +3339,27 @@
         <translation>Сабки иловагӣ:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Танзим кардани ин қимат барои рад кардани менюҳои марбути бузург.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Ҳудуди луғатҳои менюи марбуд:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Тарҷумаи пайдошаванда</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2888,136 +3370,136 @@
 ё панели система хомӯш кунед ё аз нав фаъол созед.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Хусусияти тарҷумаи пайдошавандаро фаъол кардан</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Барои фаъол ё хомӯш кардани тарҷумаи пайдошаванда, имконоти зеринро истифода баред.
 Агар ин имконотро интихоб мекунед, тарҷумаи пайдошаванда ба худкор фаъол мешавад.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Барномаро бо хусусияти тарҷумаи пайдошаванда оғоз кардан</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Бо имконоти фаъолшудаи зерин, тарҷумаи пайдошаванда намоиш дода мешавад,
 агар ҳангоми интихоби калима ҳамаи тугмаҳои интихобшуда зер карда шаванд.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Тарҷумаи пайдошаваандаро танҳо ҳангоми зеркунии тугмаҳои интихобшуда намоиш додан:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Танҳо Ctrl-и чап</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Ctrl-и чап</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Танҳо Shift-и рост</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Shift-и рост</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Тугмаи Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Тугмаи Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Танҳо Alt-и чап</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Alt-и чап</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Тугмаи Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Танҳо Alt-и рост</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Alt-и рост</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Танҳо Ctrl-и рост</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Ctrl-и рост</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Танҳо Shift-и чап</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Shift-и чап</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Тугмаи Windows ё Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3028,12 +3510,12 @@
 тугмаҳои интихобшударо баъд аз интихобкунии калима зер кунед.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Зеркунии тугмаҳои интихобшуда баъд аз</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3046,42 +3528,42 @@
 аз муддати таъйиншуда зер мекунед, тарҷума пайдо намешавад.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>сония</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Калимаи тарҷумашударо ба ҷои равзанаи пайдошаванда дар равзанаи асосӣ нишон диҳед</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Калимаи тарҷумашударо дар равзанаи нишон диҳед</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Тугмаҳои тезкор</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Барои пинҳон ва намоиш додани равзанаи асосӣ тугмаҳои зеринро истифода баред:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Барои тарҷума кардани калимаҳо аз ҳофизаи система тугмаҳои зеринро истифода баред:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Тугмаҳои интихобшудаи тезкор ҳамаҷониба мебошанд, вале танҳо ҳангоми фаъол будани луғати GoldenDict бо ягон барнома ё матн кор мекунанд.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3094,52 +3576,87 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Дар хотир доред, ки: Шумо версияи барномаи X.Org XServer-ро истифода мебаред, ки дорои RECORD-и вайроншуда мебошад. Эҳтимол, тугмаҳои тезкор дар GoldenDict кор намекунанд. Ин мушкилӣ бояд дар худи сервер ҳал карда шавад. Гузоришро барои &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ворид кардани маълумоти хато дар ин ҷо&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; пайдо кунед ва агар хоҳиш доред маслиҳати худро дар он ҷо пешниҳод кунед.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аудио</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Талаффуз</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Талаффузи худкори калимаҳо дар равзанаи асосӣ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Талаффузи худкори калимаҳо дар тарҷумаи пайдошаванда</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Иҷрои аудио</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Пахш кардани файлҳои аудиоӣ тавассути FFmpeg(libav) ва libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Истифодаи плеери дарунӣ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>Прокси система</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>Прокси фармоишӣ</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>Танзимоти прокси</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>Ҷустуҷӯи матни пурра</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>Иҷозати матни пурра барои ҷустуҷӯ:</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>Ҷустуҷӯ накардан дар луғатҳо бо зиёда аз</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>мақолаҳо (0 - номаҳдуд)</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Интихоб кардани ин имконот барои печондани мақолаҳои калон ба таври худкор</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Печондани мақолаҳо зиёда аз</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Мақалаҳои зиёда аз ин андоза мухтасар мешаванд</translation>
     </message>
@@ -3148,7 +3665,7 @@
         <translation type="obsolete">Мақолаҳое, ки зиёда аз ин андоза мебошанд, печонида мешаванд</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>аломат</translation>
     </message>
@@ -3183,59 +3700,59 @@
         <translation type="obsolete">Ба воситаи Китобхонаи басс иҷро кунед</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Ягон барномаи беруниро барои иҷрои файлҳои аудиоӣ истифода баред</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Ба воситаи барномаи дигар иҷро кунед:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Шабака</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Агар шумо мехоҳед сервери proxy-ро барои ҳамаи дархостҳои
 шабака истифода баред шумо бояд ин имконотиро фаъол кунед.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Сервери proxy-ро истифода баред</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Намуд:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Мизбон:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Корбар:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Парол:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3245,12 +3762,12 @@
 имконпазир нест, кӯшиш кунед, ки ин имконотро ғайрифаъол созед.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Намоиши мӯҳтавои тиҷориро аз вебсайтҳои дигар қатъ кунед (рекламаро пинҳон мекунад)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3259,24 +3776,24 @@
 гӯш кунед. Барои ин имконот шумо бояд плагини мувофиқро сабт кунед.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Ҷузъи иловагии вебро фаъол кардан</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Баъзе вебсайтҳо барномаи GoldenDict-ро тавассути сарварақҳои HTTP муайян мекунанд ва дархостҳои барномаро манъ мекунанд.
 Барои ҳал кардани ин мушкилӣ, ин имконотро фаъол кунед.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Пешгирии муайянкунии барномаи GoldenDict-ро дар сарварақҳои HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3288,22 +3805,22 @@
 шуморо огоҳ мекунад ва кушодани сайти луғатро пешниҳод мекунад.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Мавҷуд будани версияи навро такроран тафтиш кунед</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>&amp;Иловагӣ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Технологияҳои тарҷумаи пайдошавандаи иловагӣ</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3313,12 +3830,12 @@
 Агар шумо чунин барномаҳо истифода намебаред, имконоти зеринро истифода набаред.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>&amp;IAccessibleEx-ро истифода баред</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3327,12 +3844,12 @@
 Агар шумо чунин барномаҳо истифода намебаред, имконоти зеринро истифода набаред.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>&amp;UIAutomation-ро истифода баред</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3341,97 +3858,98 @@
 Агар шумо чунин барномаҳо истифода намебаред, имконоти зеринро истифода набаред.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>&amp;Дархости GoldenDict-ро истифода баред</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Таърих</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Барои захира кардани таърихи калимаҳои тарҷумашуда ин имконотро фаъол созед</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Захира кардани &amp;таърих</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Муайян кардани ҳаҷми иттилооти захирашуда дар таърих.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Андозаи калонтарини таърих:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Фосилаи вақти захиракунии таърих. Агар ба 0 танзим кунед, таърих танҳо дар хуруҷ захира мешавад.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Захира кардан баъд аз</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>дақиқа</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Мақолаҳо</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Барои густариш додани қисмҳои интихобии мақолаҳо ин имконотро фаъол созед</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Густариш додани &amp;қисмҳои интихобӣ</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Системаи пешфарз</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Пешфарз</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Ҳозира</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Луғати Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Луғати Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3440,12 +3958,12 @@
         <translation type="obsolete">Ба воситаи DirectShow иҷро кунед</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Забонро иваз кунед</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Барои татбиқ кардани забони интихобшуда барномаро аз нав оғоз кунед.</translation>
     </message>
@@ -3453,27 +3971,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Матни оддӣ</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Аз рӯи префикс</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Номаълум</translation>
     </message>
@@ -3499,27 +4017,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Фаъолшуда</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Намуд</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Ном</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Сатри иҷрои фармон</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Аломат</translation>
     </message>
@@ -3527,12 +4045,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Хатогии боркунии мақола</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Хатогии рамзкушоии мақола</translation>
     </message>
@@ -3643,18 +4163,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ХАТОГӢ: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Хатои захиракунии манбаъ: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Боргирии манбаъи ишорашуда қатъ карда шуд.</translation>
     </message>
@@ -3662,12 +4182,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Системаи Хэпбёрни Ромаҷӣ барои Хирагана</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Системаи Хэпбёрни Ромаҷӣ барои Катакана</translation>
     </message>
@@ -3696,21 +4216,21 @@
         <translation type="obsolete">Рӯйхати мувофиқатҳо (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Ба қафо</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Ба пеш</translation>
     </message>
@@ -3719,32 +4239,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Калимаро талаффуз кардан (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Калимаро ба равзанаи асосӣ гузоштан (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Лавҳаи луғатро пинҳон ё нишон медиҳад</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Барои мустаҳкам кардан равзана дар экран, иваз кардани ҳаҷм,
@@ -3755,8 +4275,8 @@
         <translation type="obsolete">Луғати GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3764,17 +4284,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Масир</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Ном</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Аломат</translation>
     </message>
@@ -3796,7 +4316,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Илова кардан...</translation>
     </message>
@@ -3805,7 +4326,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Тоза кардан</translation>
     </message>
@@ -3884,7 +4406,7 @@
         <translation type="obsolete">Шумо ҳамчунин метавонед сатри %GD1251%-ро барои рамзгузории CP1251 ва сатри %GDISO1%-ро барои рамзгузории ISO 8859-1 истифода баред.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Барномаҳо</translation>
     </message>
@@ -3893,27 +4415,27 @@
         <translation type="obsolete">Тамоми барномаҳои берунӣ. Сатри %GDWORD% бо калимаи дархостшуда ҷойгузин карда мешавад. Худи калима низ ба сатри вуруди калимаҳо дохил карда мешавад.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Талаффузи фаврӣ аз &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Вебсайти зерин ба одамон иҷозат медиҳад, ки онҳо тавонанд талаффузи калимаҳоро сабт ва бо дигарон мубодила намоянд. Шумо метавонед калимаҳои сабтшударо аз луғати GoldenDict гӯш кунед.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Талаффузро аз Forvo фаъол кардан</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Калиди API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3922,7 +4444,7 @@
 оянда дастнорас шавад, ё ки барои дархости калиди шахсӣ дар сайт қайд шавед.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Калиди шахсии худро аз &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;ин ҷо&lt;/a&gt; гиред, ё барои истифодаи калиди пешфарз ин амалро нодида гузаронед.</translation>
     </message>
@@ -3952,79 +4474,89 @@
 %GDBIG5% барои Big-5, %GDBIG5HKSCS% барои Big5-HKSCS, %GDGBK% барои GBK ва GB18030, %GDSHIFTJIS% барои Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Ягон барномаи берунӣ. Сатри %GDWORD% бо калимаи дархостшуда ҷойгузин мешавад. Агар чунин сатр вуҷуд надошта бошад, калима ба вуруди стандартӣ равона мешавад.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Рамзҳои забон (бо вергул ҷудо мешаванд):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Рӯйхати рамзҳои забоне, ки шумо мехоҳед дар бар гиред. Масалан: &quot;en, tg&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Рӯйхати рамзҳои забонҳои пур дар &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;ин ҷо&lt;/a&gt; дастрас аст.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Транслитератсия</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Транслитератсияи русӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Транслитератсияи юнонӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Транслитератсияи олмонӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Транслитератсияи белорусӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Истифодаи алифбои лотиниро барои навиштан бо забони ҷопонӣ фаъол мекунад</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Ромаҷии ҷопонӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Системаҳо:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Машҳуртарин тарзи транскрипткунонии калимаҳои Ҷопонӣ
 дар асоси фонологияи Англисӣ иҷро мешавад</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Хэпбёрн</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4035,12 +4567,12 @@
 Системаи дар боло зикршуда ҳоло дар луғати GoldenDict вуҷуд надорад.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Ниҳон-шикӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4051,75 +4583,77 @@
 Системаи дар боло зикршуда ҳоло дар луғати GoldenDict вуҷуд надорад.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Канрей-шикӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Алифбои ҳиҷо:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Алифбои ҳиҷои Хираганаи ҷопонӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Хирагана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Алифбои ҳиҷои Катаканаи ҷопонӣ</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Катакана</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Матн ба талаффуз</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(дар версияи кӯчондашаванда дастрас нест)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Ҷузвдонро интихоб кунед</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Тозакуниро тасдиқ кунед</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Ҷузвдони &lt;b&gt;%1&lt;/b&gt;-ро аз рӯйхат тоза мекунед?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Вебсайти &lt;b&gt;%1&lt;/b&gt;-ро аз рӯйхат тоза мекунед?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Барномаи &lt;b&gt;%1&lt;/b&gt;-ро аз рӯйхат тоза мекунед?</translation>
     </message>
@@ -4249,22 +4783,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Фаъолшуда</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Ном</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Суроға</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Аломат</translation>
     </message>
@@ -4272,7 +4806,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Дархости баъзе луғатҳо қатъ карда шуд.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/tk_TM.ts goldendict-1.5.0~git20150923/locale/tk_TM.ts
--- goldendict-1.5.0~git20131003/locale/tk_TM.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/tk_TM.ts	2015-09-23 08:26:24.000000000 +0000
@@ -38,7 +38,7 @@
         <translation>[Näbelli]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Esaslanýar  Qt %1 (%2, %3 bit)</translation>
     </message>
@@ -46,17 +46,17 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; üçin &lt;b&gt;%2&lt;/b&gt; toparynda hiç terjime tapylmady.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; toparda hiç terjime tapylmady..</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Hoş geldiňiz!</translation>
     </message>
@@ -65,47 +65,47 @@
         <translation type="obsolete">&lt;h3 align=&quot;center&quot;&gt;Hoş geldiňiz! &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Programany ulanyp başlamak üçin, ilki bilent &lt;b&gt;Redaktrile|Dictionaries menýusyna baryň&lt;/b&gt; we şol ýerden sözlük faýllaryň ýerleşýän bukjalaryny görkeziň, Wikipedia ýa-da başga çeşmeleri saýlaň, sözlükleriň görkeziş tertibini sazlaň ýa-da sözlükleriň toparyny dörediň.&lt;p&gt;Şondan soň sözleriň terjimesini gözlemäge başlap bolýar! Ony şu penjiräniň sag tarapynda ýerleşýän meýdançadan edip bolýar ýa-da &lt;a href=&quot;Ýüzüne çykýan penjire (popup) bilen işlemek&quot;&gt;göni başga programmalaryň içinden hem edip bolýar&lt;/a&gt;. &lt;p&gt;Programmany sazlamak üçin, serediň &lt;b&gt;Redaktirle|Saýlamalar menýusyna&lt;/b&gt;. Şol ýerde ýerleşen ähli sazlamalaryň gysga düşündirişi bar, bir zat düşünmeseňiz olary okamagy unutmaň.&lt;p&gt;Eger goşmaça soragyňyz bar bolsa,maslahat gerek bolsa, pikiriňizi paýlaşmak isleseňiz ýa-da beýleki ulanyjylaryň pikirlerini bilmek isleseňiz &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;foruma giriň&lt;/a&gt;.&lt;p&gt;Programmanyň &lt;a href=&quot;http://goldendict.org/&quot;&gt;websaýtyndan&lt;/a&gt; täzelikleri bilip bilersiňiz. &lt;p&gt;(c) 2008-2011 Konstantin Isakow.  GPLv3 ýa-da soňky çykan lisenziýasy boýunça.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Makalany giňelt</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Makalany kiçelt</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Hoş geldiňiz! &lt;b&gt;GoldenDict&lt;/b&gt;&lt;/h3&gt;&lt;p&gt;Programany ulanyp başlamak üçin, ilki bilen &lt;b&gt;Redaktrile|Dictionaries menýusyna baryň&lt;/b&gt; we şol ýerden sözlük faýllaryň ýerleşýän bukjalaryny görkeziň, Wikipedia ýa-da başga çeşmeleri saýlaň, sözlükleriň görkeziş tertibini goýuň ýa-da sözlükleriň toparyny dörediň.&lt;p&gt;Şondan soň sözleriň terjimesini gözlemäge başlap bolýar! Ony şu penjiräniň sag tarapynda ýerleşýän meýdançasyndan edip bolýar ýa-da &lt;a href=&quot;Ýüzüne çykýan penjire (popup) bilen işlemek&quot;&gt;göni başga programmalaryň içinden hem edip bolýar&lt;/a&gt;. &lt;p&gt;Programmany sazlamak üçin, serediň &lt;b&gt;Redaktirle|Saýlamalar menýusyna&lt;/b&gt;. Şol ýerde ýerleşen ähli sazlamalaryň gysga düşündirişi bar, bir zat düşünmeseňiz olary okamagy unutmaň.&lt;p&gt;Eger goşmaça soragyňyz bar bolsa,maslahat gerek bolsa, pikiriňizi paýlaşmak isleseňiz ýa-da beýleki ulanyjylaryň pikirlerini bilmek isleseňiz &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;foruma giriň&lt;/a&gt;.&lt;p&gt;Programmanyň &lt;a href=&quot;http://goldendict.org/&quot;&gt;websaýtyndan&lt;/a&gt; täzelikleri bilip bilersiňiz. &lt;p&gt;(c) 2008-2013 Konstantin Isakow.  GPLv3 ýa-da soňky çykan lisenziýasy boýunça.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Ýüzüne çykýan penjire (popup) bilen işlemek</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Ýüze çykýan penjireler ( popup) bilen işlemegiň düzgünleri&lt;/h3&gt;Başga programmalaryň içinden sözleri terjime etmek üçin, şuny açmak gerek: &lt;i&gt;&quot;Skan popup&quot;&lt;/i&gt; in &lt;b&gt;Saýlamalar menýusynyň içinde ýerleşýär&lt;/b&gt;, soň ony Popup nyşany açyp ýa-da aşakdaky panelden myşkanyň sag düwmesine basyp işe göýbermek bolýar.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Ondan soň, başga programmanyň içinde kursory gyzyklanýan sözüň üstüne getiriň - ýüze çykan penjirede onuň düşündirilişi görkeziler.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Ondan soň, başga programmanyň içinde gyzyklanýan sözüňiziň üstüne myşka bilen iki gezek basyň ýa-da bellik ediň,soň- ýüze çykan penjirede onuň düşündirilişi görkeziler.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(atsyz)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(surat)</translation>
     </message>
@@ -113,37 +113,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Makalany giňelt</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Sözlük  </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Makalany kiçelt</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Sorag ýalňyşlygy: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Ýakyn sözler: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Goşma aňlatmalar: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Aýry sözler: </translation>
     </message>
@@ -156,57 +156,59 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>barada: boş</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Tap:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Yza</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Indiki</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Uly-kiçi harplara duýgurlyk</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Belle&amp;hemmesini</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Çeşme</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Kesgitleme: %1</translation>
     </message>
@@ -215,139 +217,140 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Şu makalany saýla</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Tekst görnüşinde kopiýa et</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Gözden geçir</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS sesi</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Surat</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Wideo: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Adalga şu sözlükden alyndy - &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Salgylanan çeşme ýok.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Salgylanan audio programa ýok.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>ÝALŇYŞLYK: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Linki aç</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Linki täze aç &amp;Tab-dan</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Linki &amp;Daşky Brauzerden aç</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Surady &amp;ýatda sakla - ...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Ýatda sakla s&amp;esi - ...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Tap &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Tap &quot;%1&quot; in &amp;New Tab</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Iber &quot;%1&quot; girizme setire</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Goş &quot;%1&quot; geçmişe</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Tap &quot;%1&quot; in %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Tap &quot;%1&quot; in %2 in &amp;New Tab</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Ýatda sakla sesini</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Ses faýllary (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Ähli faýllar (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Surady ýatda sakla</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Surat faýllary (*.bmp *.jpg *.png *.tif);;All files (*.*)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>DUÝDURYŞ: FFmpeg Audio Player: %1</translation>
     </message>
@@ -360,27 +363,27 @@
         <translation type="obsolete">WAV-dan daşaryfaýllaryň oýnadylmagy üçin, Redaktirle|Saýlamalar baryň, Audio wkladkasyny saýlaň we şol ýerden DirectShow arkaly oýnatmagy saýlaň.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Şu ses faýly açmak üçin gerek bolan pleýeri işledip bolmady: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Wagtlaýyn faýly döredip bolmady.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Çeşme faýly awtomat açyp bolmady, özbaşdak açmaga synanşyň: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>ÄGÄ BOLUŇ %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Salgylanýan çeşmäni ýükläp almak bolmady.</translation>
     </message>
@@ -405,6 +408,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Parol:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -505,6 +531,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Tekst faýllary (*.txt);;Ähli faýllar (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Yza Gaýtar</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -547,6 +686,16 @@
         <translation>Häsiýetnama:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -563,6 +712,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Işledilen</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Ady</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Adres</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">Nyşan</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -584,17 +801,22 @@
         <translation>Şu topary üýtget</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Sözlük barada maglumat</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Sözlügiň bukjasyny aç</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Sözlügi üýtget</translation>
     </message>
@@ -607,39 +829,39 @@
         <translation>Sözlükler</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Çeşmeler</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Sözlükler</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Toparlar</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Çeşmeler üýtgedildi</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Käbir çeşmeler üýtgedildi. Üýtgeşmeleri kabul etmek isleýäňmi?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Kabul et</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Yza Gaýtar</translation>
     </message>
@@ -653,6 +875,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished">Hiç birisi</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished">Hiç birisi</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -691,6 +999,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Yza Gaýtar</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -821,7 +1188,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Ähli toparlary aýyr</translation>
     </message>
@@ -831,42 +1198,100 @@
         <translation>Süýre&amp;taşla sözlükleri toparyň içine ýa-da daşyna, myşkanyň kömegi bilen toparyň içinde ýerlerini ýa-da tertibini üýtget.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Topary goş</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Täze topara at ber:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Toparyň adyny üýtget</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Topara täze adyny ber:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Topary aýyr</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt;? topary çyndan hem aýyrmak isleýäňmi?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Siz çyndanam ähli toparlary aýyrmak isleýärsiňizmi?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Yza gaýt</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Ulalt</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Kiçelt</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normal ululygy</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -897,12 +1322,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Dürs ýazuw kadalary hödürlemek: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 Morfologiýa</translation>
     </message>
@@ -910,12 +1335,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Işledilen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Ady</translation>
     </message>
@@ -1955,7 +2380,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Sözlük ýüklenende ýalňyşlyk çykdy</translation>
     </message>
@@ -1963,7 +2388,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Konfigurasiýa faýlynda ýalňyşlyk bar. Başlangyç sazlamalar bilen dowam etjekmi?</translation>
     </message>
@@ -1976,37 +2401,37 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Hoş geldiňiz!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Faýl</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redaktirle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Kömek</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>&amp;Görnüş</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Ulalt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Geçmiş</translation>
     </message>
@@ -2023,185 +2448,215 @@
         <translation type="obsolete">&amp;Sözlükler...	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Gözleg tagtasy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Nawigasiýa tagtasyndan netijeler</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Geçmiş tagtasy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Sözlükler...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Saýlamalar...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Baş sahypa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>&amp;Maglumat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>GoldenDict barada</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Çyk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Programadan çyk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Forum</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Panel içine buk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Penjireleri paneliň içinde gizlemek</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Makalany ýatda sakla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Ýatda sakla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Çap et</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>Sahypany &amp;sazla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Çap edilen &amp;görnüşi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Faýllary täzeden gözden geçirmek</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Täze wkladka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Görkez</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Mydama ýokarda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Mydama ýokarda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Menýu düwmesi</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Çap edilen görnüşi</translation>
     </message>
@@ -2210,27 +2665,27 @@
         <translation type="obsolete">Faýllary täzeden skanerlemek</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Arassala</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Täze wkladka</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Konfigurasiýa bukjasy</translation>
     </message>
@@ -2243,18 +2698,18 @@
         <translation type="obsolete">Gurallar zolagynda nyşanlary kiçi et</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Menýu zolagy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Tap şu ýerde:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Sözlüklerden tapylan:</translation>
     </message>
@@ -2263,204 +2718,215 @@
         <translation type="obsolete">Nawigasiýa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Yza gaýt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Ugrukdyr</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Skan popup</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Sözi eşitdirmek (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Ulalt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Kiçelt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Normal ululygy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Sözleri ulalt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Sözleri kiçelt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Sözleriň normal ululygy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Görkez &amp;Esasy penjiräni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Şu wagtky wkladkany ýap</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Ähli açyk wkladkalary ýap</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Şu wagtky açylandan daşary ähli başga wkladkalary ýap</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Ýüklenip alynýar...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>API elýeterli edilmedik</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 sözlükler, %2 makalalar, %3 sözler</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Tap:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Ählisi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Makala ýatda saklanýar...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Baş penjire mydama ýokarda durar ýaly edilen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Gizle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Geçmişi faýl görnüşinde eksport et</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Tekst faýllary (*.txt);;Ähli faýllar (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Geşmiş eksport edildi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Eksport ýalnyşlygy:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Faýldan geçmişi import et</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Import ýalňyşlygy: faýlda nädogry maglumatlar bar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Geçmiş import edildi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Import ýalňyşlygy:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Sözlük barada maglumat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Sözlügiň bukjasyny aç</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Sözlügi üýtget</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Açyk wkladkalar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Sözlük &amp;tagtasynda atlary görkez</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Kiçi nyşanlary görkez &amp;gurallar-tagtasynda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nawigasiýa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Açyk wkladkalaryň sanawy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(atsyz)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2469,67 +2935,67 @@
         <translation type="obsolete">ÄGÄ BOLUŇ %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Täze neşir elýeterli</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Ýükläp almak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Şu neşiri böküp geç</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Siz menýu zolagyny gizlemägi saýladyňyz. %1 ulanyp ýenede çykaryp görkez.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Sahypany sazlamak</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Printer ýok. Ilki bilen gurna ony.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Makalany çap et</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Makala, taýýar (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Makala, HTML diňe (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Makalany şular ýaly ýatda sakla</translation>
     </message>
@@ -2538,12 +3004,12 @@
         <translation type="obsolete">Html faýllar (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Ýalňyş</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Makalany ýatda saklap bolmady %1</translation>
     </message>
@@ -2551,12 +3017,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Sözlük faýly bozuldy ýa-da zaýa boldy</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation> %1-den/dan makalany ýükläp bolmady, sebäbi: %2</translation>
     </message>
@@ -2564,7 +3030,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML analizinde ýalňyşlyk: %1 at %2,%3</translation>
     </message>
@@ -2572,7 +3038,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML analizinde ýalňyşlyk: %1 at %2,%3</translation>
     </message>
@@ -2580,22 +3046,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Işledilen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Ady</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Nyşan</translation>
     </message>
@@ -2608,88 +3074,94 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Sözlügiň tertibi:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Işjeň däl (öçürilen) sözlükler:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Sözlük barada maglumat</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Ady:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Jemi makala sany:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Jemi söz sany:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Terjime edýär şu dilden:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Terjime edýär şu dile:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Häsiýetnama:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Şu sözlügiň düzümine girýän faýlllar:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Içine zatlary süýräp we taşlap tertibini üýtgedip bolýar. Sözlükleri öçürmek üçin, olary aktiw däl toparyna taşlamaly.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Ady boýunça sortla</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Dili boýunça sorla</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Ýol</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Rekursiw</translation>
     </message>
@@ -2848,22 +3320,27 @@
         <translation>Ctrl-Tab arkaly wkladkalary MRU tertipde nawigasiýa edilýär</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Şu bahany sazlap juda uly kontekst menýularyň öňüni almak mümkin.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Kontekst menýu sözlükleriň çägi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Skan popup</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2874,136 +3351,136 @@
 off from main window or tray icon.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Skan ýüze çykarmagyna rugsat ber</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Skan ýüze çykarmany işledip başlat</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Ýüze çykarmagy (popup) görkez diňe ähli saýlanan düwmler basylyp saklananda:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Çep Ctrl diňe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Çep Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Sag Shift diňe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Sag Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt düwmesi</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Ctrl düwmesi</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Çep Alt diňe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Çep Alt </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Shift düwmesi</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Sag Alt diňe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Sag Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Sag Alt diňe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Sag Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Çep Shift diňe</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Çep Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows düwme ýa-da Meta düwme</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3014,12 +3491,12 @@
 be pressed shortly after the selection is done.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Düwmeleri soň hem basmak bolýar, şu çäklerde</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3028,42 +3505,42 @@
 seconds, which is specified here.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>sekunt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Terjime edilen sözleri ýüze çykýan penjireden görkezmän olary baş penjirä iber</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Terjime edilen sözleri baş penjirä iber</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Gyzgyn düwmeler</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Baş penjiräni görkezmek ýa-da gizlemek üçin şeýle  düwmeleri ulan:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Buferde saklanan sözi terjime etmek üçin şeýle düwmeleri ulan:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Bu gyzgyn düwmeler globaldyr we GoldenDict açyk duran wagty islendik başga programmada hem ýerlerde  işleýärler.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3076,112 +3553,147 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Note: You appear to be running an X.Org XServer release which has the RECORD extension broken. Hotkeys in GoldenDict will probably not work. This must be fixed in the server itself. Please refer to the following &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug entry&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; and leave a comment there if you like.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Aýdyş</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Baş penjirede sözleriň awto-aýdylyşy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Skan popup-dan sözleriň awto-aýdylyşy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Oýnatmak</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Audio faýllary FFmpeg(libav) we libao arkaly oýnat</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Içerki pleýeri ulan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Geçmiş</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Şuny aç eger-de geçmişde terjime edilen sözleri ýatda saklajak bolsaň</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Saklanma &amp;geçmiş</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Geçmişde iň köp saklanjak girizmeleriň sany.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Geçmişiň maksimum sany:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Geçmişi ýatda saklanmagyň döwri. Eger 0 goýulsa, geçmiş diňe çykan wagty ýatda saklanar.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Ýatda sakla her</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>minut</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>makalalar</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Makalalaryň goşmaça ýerlerini giňeldip görkezmek üçin şuny saýlaň</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Goşmaça &amp;ýerlerini giňeldip görkez</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Uly makalalaryň awtomat kiçi edilip görkezilmegi üçin şuny saýlaň</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Makalalary kiçelt şundan köp - </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Şundan uly bolan makalalar kiçi edilip görkeziljek</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>nyşanlar</translation>
     </message>
@@ -3206,59 +3718,59 @@
         <translation type="obsolete">Phonon arkaly oýnatmak</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Audio faýllary oýnatmak üçin islendik özge programmany ulan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Daşky programmany ulan:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Baglanyşyk ulgamy</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Proksi serweri ulan</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Öy eyesi:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Ulanyjy:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Parol:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3267,12 +3779,12 @@
 you are browsing. If some site breaks because of this, try disabling this.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Özge saýtlardan zat ýüklemegi gadagan et (köp sanly reklama/mahabt gizlemgegini üpjün edýär)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3281,24 +3793,24 @@
 Plugin must be installed for this option to work.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Web plugin-leri işlet</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Käbir websaýtlar GoldenDict programmany HTTP ady arkaly görýärler we olara ýüz tutmaga rugsat berenoklar. 
 Şeýle meseläni çözmek üçin, şuny işlediň.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>GoldenDict HTTP ady arkaly görkezme</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3311,22 +3823,22 @@
 download page.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Programmanyň täze neşirlerini wagtal-wagtal barlap dur</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>Has &amp;çylşyrymly</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>SkanPopup goşmaça tehnologiýalary</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3337,12 +3849,12 @@
 It is not needed to select this option if you don&apos;t use such programs.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Ulan &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3351,12 +3863,12 @@
 It is not needed to select this option if you don&apos;t use such programs.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Ulan &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3365,42 +3877,43 @@
 It is not needed to select this option if you don&apos;t use such programs.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Ulan &amp;GoldenDict habarlary</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Sistemanyň başlangyç bahalary</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Ilkibaşky ýagdaýy</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Häzirki zaman</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3409,12 +3922,12 @@
         <translation type="obsolete">DirectShow arkaly oýnatmak</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Dili çalşmak</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Diliň çalşmagyny işe girizmek üçin programmany täzeden işlet.</translation>
     </message>
@@ -3422,27 +3935,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Düz tekst</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Prefiks gabat getirme</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Näbelli</translation>
     </message>
@@ -3468,27 +3981,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Işledilen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Tip</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Ady</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Komanda setiri</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Nyşan</translation>
     </message>
@@ -3496,12 +4009,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Makala ýüklenende ýalňyşlyk ýüze çykdy</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Makala dekodirlenen wagty ýalňyşlyk ýüze çykdy</translation>
     </message>
@@ -3612,18 +4127,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2202"/>
-        <location filename="../articleview.cc" line="2209"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>ÝALŇYŞLYK: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2202"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Çeşmäni ýatda saklamagyň ýalňyşlygy:</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2209"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Salgylanýan çeşmäni ýükläp almak bolmady.</translation>
     </message>
@@ -3631,12 +4146,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Hiragana üçin Hepburn Romaji </translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Katakana üçin Hepburn Romaji</translation>
     </message>
@@ -3665,11 +4180,11 @@
         <translation type="obsolete">Gabat gelýänleriň sanawy (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3678,50 +4193,50 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Yza gaýt</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Öňe geç</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Sözi eşitdirmek (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Sözi baş penjirä iber (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Sözlük zolagy görkezýär ýa-da gizleýär</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3729,17 +4244,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Ýol</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Ady</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Nyşan</translation>
     </message>
@@ -3761,7 +4276,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Goşmak...</translation>
     </message>
@@ -3770,7 +4286,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Aýyr</translation>
     </message>
@@ -3847,7 +4364,7 @@
         <translation type="obsolete">Ýogsam, ulan %GD1251% (CP1251 üçin), %GDISO1%  (ISO 8859-1 üçin).</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Programmalar</translation>
     </message>
@@ -3856,27 +4373,27 @@
         <translation type="obsolete">Any external programs. A string %GDWORD% will be replaced with the query word. The word will also be fed into standard input.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Janly aýdylyşy şu ýerden alynýar -  &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Bu websaýt adamlar üçin sözleriň aýdyşyny ýazga geçirmäge we paýlaşmaga mümkinçilik berýär. Olary GoldenDict arkaly diňläp bolýar.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Forvo-dan aýdyşyny aç</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API açary:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -3908,83 +4425,93 @@
 %GDBIG5% - Big-5 üçin, %GDBIG5HKSCS% - Big5-HKSCS üçin, %GDGBK% - GBK and GB18030 üçin, %GDSHIFTJIS% - Shift-JIS üçin.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Islendik daşky programma. Setir %GDWORD% gözlenýän sözi bilen çalşyryljak. Eger şeýle setir berilmese, şol söz standart girizmä geçiriler.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Öz açaryňy &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;şu ýerden al&lt;/a&gt;, ýa-da, başdaky açary ulanmak üçin, boş goý.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Dil kodlary (otur bilen bölünen):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Almak isleýän dil kodlarynyň sanawy: Mysal: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Dil kodlarynyň doly sanawy bar &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Transliterasiýa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Rus transliterasiýa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Grek transliterasiýa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Nemes transliterasiýa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Belarus transliterasiýa</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Ýapon dilinde ýazan mahalynda latin harplary ulanmaga rugsat berýär</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Ýapon romaji</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Sistemalar:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation> Ýapon diliniň iňlis fonologiýasynda iň köp ulanylýan transkripsiýa usuly. </translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Hepburn</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3994,12 +4521,12 @@
 Entek GoldenDict-de edilmedik.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Nihon-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4010,75 +4537,77 @@
 Entek GoldenDict-de edilmedik.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Kunrei-shiki</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Bogunlaryň elipbiýi:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Hiragana ýapon bogunlaryň elipbiýi</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Hiragana</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Katakana ýapon bogunlaryň elipbiýi</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Katakana</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Teksti gürläp aýtdyrmak</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(ykjam/portable wersiýada elýeterli däl)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Bukjany saýla</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Aýyrmagy tassykla</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; bukjasyny sanawdan aýyrmalymy?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; saýty sanawdan aýyrmalymy?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; programmany sanawdan aýyrmalymy?</translation>
     </message>
@@ -4208,22 +4737,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Işledilen</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Ady</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Nyşan</translation>
     </message>
@@ -4231,7 +4760,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Käbir sözlükleri tapyp bolmady.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/tr_TR.ts goldendict-1.5.0~git20150923/locale/tr_TR.ts
--- goldendict-1.5.0~git20131003/locale/tr_TR.ts	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/tr_TR.ts	2015-09-23 08:26:24.000000000 +0000
@@ -337,6 +337,25 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished">Parola:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <source>Form</source>
@@ -415,6 +434,97 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Metin Dosyaları (*.txt);;Tüm Dosyalar (*.*)</translation>
+    </message>
+    <message>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">İptal</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <source>Total articles:</source>
@@ -453,6 +563,14 @@
 %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DictListModel</name>
@@ -462,6 +580,62 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished">Etkin</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">İsim</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">Adres</translation>
+    </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Edit this group</source>
@@ -491,6 +665,10 @@
         <source>Extended menu with all dictionaries...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditDictionaries</name>
@@ -535,6 +713,75 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Yok</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Yok</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <source>by</source>
@@ -566,6 +813,53 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">İptal</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <source>German Transliteration</source>
@@ -707,6 +1001,53 @@
         <source>Remove all dictionary groups</source>
         <translation>Tüm sözlük gruplarını kaldır</translation>
     </message>
+    <message>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Önceki</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Sonraki</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">Yaklaş</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Uzaklaş</translation>
+    </message>
+    <message>
+        <source>Normal Size</source>
+        <translation type="unfinished">Normal Boyut</translation>
+    </message>
+    <message>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HistoryPaneWidget</name>
@@ -2063,6 +2404,39 @@
         <source>Open dictionary folder</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mdx::MdxArticleRequest</name>
@@ -2112,7 +2486,7 @@
     <name>OrderAndProps</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <source>Form</source>
@@ -2170,6 +2544,14 @@
         <source>Sort by languages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
@@ -2782,6 +3164,38 @@
         <source>Articles longer than this size will be collapsed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
@@ -3325,6 +3739,14 @@
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StylesComboBox</name>
diff -Nru goldendict-1.5.0~git20131003/locale/uk_UA.ts goldendict-1.5.0~git20150923/locale/uk_UA.ts
--- goldendict-1.5.0~git20131003/locale/uk_UA.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/uk_UA.ts	2015-09-23 08:26:24.000000000 +0000
@@ -39,7 +39,7 @@
         <translation>[Невідомий]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>Основано наQt %1 (%2, %3 біт) </translation>
     </message>
@@ -47,62 +47,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>Розкрити статтю</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>Згорнути статтю</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>Нема перекладу для &lt;b&gt;%1&lt;/b&gt; в групі &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>Нема перекладу в групі &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>Ласкаво просимо!</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Ласкаво просимо до &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Щоб розпочати роботу з програмою, спочатку відвідайте &lt;b&gt;Зміни|Словники&lt;/b&gt;, та додайте деякі шляхи до словників, де їх можна знайти, вкажіть варіанти сайтів Wikipedia або інших джерел, встановити порядок словників або згрупувати словники.&lt;p&gt;І тоді ви зможете шукати самі слова! Ви можете це здійснити в цьому вікні, використовуючи панель зліва, або можете через &lt;a href=&quot;Контекстні вікна&quot;&gt;шукати слова з інших запущених програм&lt;/a&gt;. &lt;p&gt;Щоб налаштувати програму, перевірте доступність налаштувань в &lt;b&gt;Зміни|Налаштування&lt;/b&gt;. Всі параметри мають підказки, переконайтесь, що прочитали їх, якщо в чомусь не впевнені.&lt;p&gt;Якщо потрібна допомога, маєте якісь запитання, поради або просто бажаєте поділитись враженнями, ми будемо раді кожному на &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;форумі&lt;/a&gt; програми.&lt;p&gt;Відвідайте &lt;a href=&quot;http://goldendict.org/&quot;&gt;сайт&lt;/a&gt; програми щодо оновлень. &lt;p&gt;© 2008–2013 Konstantin Isakov. Ліцензовано за GPLv3 або пізнішої версії.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>Контекстні вікна</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;Контекстні вікна&lt;/h3&gt;Для пошуку слів з інших запущених програм вам потрібно ввімкнути &lt;i&gt;«Контекстні вікна»&lt;/i&gt; в меню &lt;b&gt;Налаштування&lt;/b&gt; і потім може увімкнути його в будь-який момент натиснувши піктограму «Контекстне вікно» вище, або натиснувши піктограму в лотку нижче правим клацом мишки і вибравши його в контекстному меню. </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>Потім наведіть курсор миші на слово, котре ви бажаєте перекласти, у сторонній програмі, тоді появиться контекстне вікно з потрібним описом слова.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>Тепер виберіть будь-яке слово,котре ви бажаєте перекласти, у сторонній програмі за допомогою мишки (подвійний клац або підвівши курсор при затиснутій лівій кнопці), тоді появиться контекстне вікно з потрібним описом слова.</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>(без назви)</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>(зображення)</translation>
     </message>
@@ -110,37 +110,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>Розкрити статтю</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>Зі словника</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>Згорнути статтю</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>Помилка запиту: %1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>Близькі за значенням: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>Словосполучення: </translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>Окремі слова: </translation>
     </message>
@@ -153,87 +153,89 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>Знайти:</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>&amp;Попереднє</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>&amp;Наступне</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;З урахуванням регістру</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>Виділити &amp;все</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>Вибрати поточний об&apos;єкт</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>Скопіювати як текст</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>Дослідити</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>Ресурс</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>Аудіо</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>Голос TTS</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>Зображення</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>Визначення зі словника &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>Визначення: %1</translation>
     </message>
@@ -242,99 +244,100 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>Вказаного ресурсу не існує.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>Вказана аудіо програма не існує.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>Помилка:%1 </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>Зберегти звук</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>Звукові файли(*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Усі файли (*.*) </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>Зберегти малюнок</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>Графічні файли (*.bmp *.jpg *.png *.tif);;Усі файли (*.*) </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>&amp;Відкрити посилання</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translation>Відеозапис</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation>Відеозапис: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>Відкрити посилання в новій в&amp;кладці</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>Відкрити посилання у &amp;зовнішньому переглядачі</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>&amp;Пошук «%1»</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>Пошук «%1» в &amp;новій вкладці</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>Послати &quot;%1&quot; до стрічки введення</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>&amp;Додати &quot;%1&quot; до історії</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>Пошук «%1» в %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>Пошук «%1»в %2 в &amp;новій вкладці</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>Попередження: звуковий програвач FFmpeg: %1</translation>
     </message>
@@ -355,37 +358,37 @@
         <translation type="obsolete">Басова бібліотека не взмозі відтворити цей звук.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>Не вдалось запустити програвач для відтворення звукового файла: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>Не вдалось створити тимчасовий файл.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>Не вдалось відкрити файл ресурсу, спробуйте відкрити вручну: %1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>Не вдалось звантажити вказаний ресурс.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>Зберегти &amp;зображення…</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>Зберегти з&amp;вук</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>УВАГА: %1s</translation>
     </message>
@@ -411,6 +414,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation type="unfinished">Пароль:</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -511,6 +537,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation type="unfinished">Текстові файли (*.txt);;Всі файли (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Скасувати</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -553,6 +692,16 @@
         <translation>Опис:</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -569,6 +718,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">Увімкнено</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">Назва</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">Адреса</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -590,17 +807,22 @@
         <translation>Редагувати цю групу</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>Інфа словника</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>Відкрити словникову теку</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>Редагувати словник</translation>
     </message>
@@ -613,39 +835,39 @@
         <translation>Словники</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>&amp;Джерела</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>&amp;Словники</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>&amp;Групи</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>Джерела змінено</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>Деякі джерела змінено. Бажаєте прийняти ці зміни?</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>Прийняти</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>Скасувати</translation>
     </message>
@@ -659,6 +881,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -697,6 +1005,65 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -827,7 +1194,7 @@
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>Вилучити всі групи</translation>
     </message>
@@ -837,42 +1204,100 @@
         <translation>Перено&amp;сьте словники з/в групи, переміщайте їх усередині групи, впорядковуйте використовуючи мишку.</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>Додати групу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>Надайте назву новій групі:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>Перейменуйте групу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>Надайте нову назву групі:</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>Вилучити групу</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>Бажаєте вилучити групу &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>Бажаєте вилучити всі групи?</translation>
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">Вперед</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">Зблизити</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Віддалити</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">Нормальний розмір</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -903,12 +1328,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>Орфографічні підказки: </translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>Морфологія %1</translation>
     </message>
@@ -916,12 +1341,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>Увімкнено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
@@ -1962,7 +2387,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>Помилка завантаження словників</translation>
     </message>
@@ -1970,7 +2395,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>Помилка в файлі налаштувань. Продовжити з типовими параметрами?</translation>
     </message>
@@ -1983,37 +2408,37 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>Ласкаво просимо!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>З&amp;міни</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>&amp;Довідка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>П&amp;ерегляд</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>&amp;Масштаб</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>&amp;Журнал</translation>
     </message>
@@ -2022,12 +2447,12 @@
         <translation type="obsolete">Панель пошуку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>&amp;Словники…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
@@ -2036,154 +2461,184 @@
         <translation type="obsolete">&amp;Групи…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>&amp;Лоток пошуку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>&amp;Лоток результатів</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>&amp;Лоток історії</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Налаштування…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>&amp;Сторінка проекту</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>П&amp;ро програму</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>Про GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Вихід</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>Вийти з програми</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>&amp;Форум</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>&amp;Сховати в лоток</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>Сховати вікно в лоток</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>&amp;Зберегти статтю</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>Зберегти статтю</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>&amp;Надрукувати</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>&amp;Параметри сторінки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>Попередній перегляд дру&amp;ку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>&amp;Повт. просканувати файли</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>&amp;Нова вкладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>&amp;Завжди зверху</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>Завжди зверху</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>Кнопка меню</translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Print Preview</source>
         <translation type="obsolete">Перегляд друку</translation>
     </message>
@@ -2192,48 +2647,48 @@
         <translation type="obsolete">Переглянути файли</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>&amp;Очистити</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>Нова вкладка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>&amp;Тека конфігурації</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>&amp;Показати</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>&amp;Експортувати</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>&amp;Імпортувати</translation>
     </message>
@@ -2242,18 +2697,18 @@
         <translation type="obsolete">Показувати назви в панелі словника</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>&amp;Лоток меню</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>Пошук в:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>Знайдено у словниках:</translation>
     </message>
@@ -2262,127 +2717,127 @@
         <translation type="obsolete">Навігація</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>Вперед</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>Переглянути</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Вимовити слово (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>Зблизити</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>Віддалити</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>Нормальний розмір</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>Зблизити слова</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>Віддалити слова</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>Звичайний розмір слів</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>Показати &amp;головне вікно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>Закрити поточну вкладку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>Закрити всі вкладки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>Закрити всі вкладки заодно з поточною</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>Завантаження…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>%1 словників, %2 статей, %3 слів</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>Шукати:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>Усьому</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>Відкриті вкладки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>Відображувати назви у &amp;Рядку словника</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>Показувати малі налички у &amp;тулбарі</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Навігація</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>Відчинити список вкладок</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>(без назви)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -2391,73 +2846,79 @@
         <translation type="obsolete">Попередження: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>Не вдалось запустити механізм стеження за гарячими клавішами.&lt;br&gt;Переконайтесь, що ваш XServer має розширення RECORD увімкнутим.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>Доступний новий випуск</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>Версія &lt;b&gt;%1&lt;/b&gt; GoldenDict доступна до звантаження.&lt;br&gt;Натисніть &lt;b&gt;Звантажити&lt;/b&gt;, щоб перейти до сторінки звантаження.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>Звантажити</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>Пропустити цей випуск</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>API доступності не ввімкнено</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>Ви вирішили сховати лоток меню. Викор. %1 аби показувати його знову.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>Параметри сторінки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>Не знайдено жодного принтера. Будь ласка, спершу встановіть хоч якийсь.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>Надрукувати статтю</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>Стаття, Повна (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>Стаття, тільки HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>Зберегти статтю як</translation>
     </message>
@@ -2466,83 +2927,88 @@
         <translation type="obsolete">Файли HTML (*.html *.htm)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>Помилка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>Неможливо зберегти статтю: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>Збередення статті…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>Головне меню налаштовано аби завжди бути зверху.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>&amp;Сховати</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>Експортувати файл історії</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>Текстові файли (*.txt);;Всі файли (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>Експорти історії завершено</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>Помилка експортування:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>Імпортувати історію з файлу</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>Помилка імпорту: недійсна дата у файлі</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>Імпорти історії завершено</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>Помилка імпортування:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>Інфа про словник</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>Відкрити словникову теку</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>Редагувати словник</translation>
     </message>
@@ -2550,12 +3016,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>Словниковий файл пошкоджено</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>Не вдалося завантажити статтю з%1, причина: %2</translation>
     </message>
@@ -2563,7 +3029,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Помилка аналізу XML: %1 в %2,%3</translation>
     </message>
@@ -2571,7 +3037,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>Помилка аналізу XML: %1 в %2,%3</translation>
     </message>
@@ -2579,22 +3045,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>Увімкнено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>Наличка</translation>
     </message>
@@ -2607,88 +3073,94 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>Порядок словників:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>…</translation>
+        <translation type="obsolete">…</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>Вимкнені словники:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>Інформація про словник</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>Назва:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>Статей загалом:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>Слів загалом:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>Переклад з:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>Переклад на:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>Файли, які охоплює словник:</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>Впорядковуйте словники, переміщуючи пункти словників. Вимикайте словники, переносячи їх у відповідну групу.</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>Сортувати за іменем</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>Сортувати за мовою</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>Шлях</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>Рекурсивно</translation>
     </message>
@@ -2846,22 +3318,27 @@
         <translation>Стиль додатку:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>Скоригуйте це значення, щоб уникнути величезних контекстних меню.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>Обмеження контекстного меню для словників:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>&amp;Контекстне вікно</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2872,136 +3349,136 @@
 вимкнути/ввімкнути це з головного меню або піктограми лотку.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>Увімкнути контекстні вікна</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>Визначає, чи типово ввімкнуті контекстні вікна, чи ні. Якщо це відмічено,
 програма завжди запускатиметься з контекстними меню.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>Увімкнути контекстні меню при запуску</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>Коли це ввімкнено, контекстні вікна будуть появлятись лише при затисненні
 всіх вибраних клавіш з виділеним словом.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>Показувати контекстні вікна лише, коли затиснено всі ці вибрані клавіші:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>Лише лівий Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>Лівий Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>Лише правий Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>Правий Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Будь-який Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Будь-яка Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>Лише лівий Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>Лівий Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Будь-який Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>Лише правий Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>Правий Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>Лише правий Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>Правий Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>Лише лівий Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>Лівий Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Будь-яка Windows або Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3012,12 +3489,12 @@
 клавіші можуть бути затиснуті й опісля виділення.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>Клавіші можна натиснути згодом</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -3026,42 +3503,42 @@
 Значення в секундах вказується тут.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>Послилати перекладене слово до головного вікна, замість того аби показувати його у виринаючому вікні</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>Послилати перекладене слово до головного вікна</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>Гарячі клавіші</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>Щоб показувати і ховати головне вікно, використовується така комбінація клавіш:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>Щоб перекладати слово з кишені, використовується така комбінація клавіш:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>Гарячі клавіші — загальні та працюють з будь-якої програми і з будь-яким текстом, поки GoldenDict працює фоново.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3074,57 +3551,92 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Майте на увазі: ви використовуєте випуск X.Org XServer, який не підтримує розширення RECORD. Гарячі клавіші в GoldenDict, імовірно, не працюватимуть. Це має бути виправлено сервером. Будь ласка, зверніться за &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;інформацію про ваду&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; та залиште коментарі, якщо бажаєте.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аудіо</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>Вимова</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>Автоматично вимовляти слово в головному меню</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>Автоматично вимовляти слова в контекстному меню</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>Відтворення</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>Програвати аудіофайли через FFmpeg(libav) та libao</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>Використовувати внутрішній програвач</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>Виберіть це, щоб автоматично згортати великі статті</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>Згортати статті з понад</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>Статті довші за цей розмір буде згорнуто</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>символів</translation>
     </message>
@@ -3159,59 +3671,59 @@
         <translation type="obsolete">Програти за допомогою Бас бібліотеки</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>Використовувати якусь сторонню програму для відтворення звукових файлів</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>Використовувати сторонню програму:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>&amp;Мережа</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>Увімкніть, якщо ви бажаєте використовувати 
 проксі-сервер для всіх мережевих запитів.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>Використати проксі-сервер</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>Вузол:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>Користувач:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3220,12 +3732,12 @@
 Якщо деякі сайти не працюють, вимкніть це.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>Заборонити завантажувати вміст з інших сайтів (ховає більшість реклами)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3234,24 +3746,24 @@
 Плагін мусить бути інстальованим аби ця опція працювала.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>Увімкнути веб плагіни</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>Деякі сайти виявлять GoldenDict через загловок HTTP і блокують запити.
 Щоб обійти цю проблему, ввімкніть цей параметр.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>Не отожнювати GoldenDict в заголовках HTTP</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -3264,22 +3776,22 @@
 відкрити сторінку звантаження.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>Періодично перевіряти на випуски нової версії</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>До&amp;даткові</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>Нові  технології ScanPopup</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3290,12 +3802,12 @@
 Ви не мусите обирати цю опцію, якщо ви не користуєтесь такими програмами.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>Використовувати &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3304,12 +3816,12 @@
 Ви не мусите обирати цю опцію, якщо ви не користуєтесь такими програмами.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>Використовувати &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3318,97 +3830,98 @@
 Ви не мусите обирати цю опцію, якщо ви не користуєтесь такими програмами.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>Використовувати &amp;GoldenDict повідомлення</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>Історія</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>Увімкніть цю опцію аби зберігати історію перекладених слів</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>Зберегти &amp;Історію</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>Зазначте максимальну кількість статей, що зберігають в історії.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>Максимальний розмір історії:</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>Проміжок збереження історії. Якщо вказати 0, то історія зберігатиметься тільки після виходу з програми.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>Зберігати кожні</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>хвилин</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>Статей</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>Увімкніть цю опцію аби завжди додаткові частини статтей</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>Показувати додаткові &amp;частини</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>Системна</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>Типово</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>Modern</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>Lingoes</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>Lingoes-Blue</translation>
     </message>
@@ -3417,12 +3930,12 @@
         <translation type="obsolete">Програвати через DirectShow</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>Зміна мови</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>Перезапустіть програму, щоб змінити мову.</translation>
     </message>
@@ -3430,27 +3943,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>Аудіо</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>Звичайний текст</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>Співпадання префіксу</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>Невідомий</translation>
     </message>
@@ -3476,27 +3989,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>Увімкнено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>Командний рядок</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>Наличка</translation>
     </message>
@@ -3504,12 +4017,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>Помилка завантаження статті</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>Помилка розкодування статті</translation>
     </message>
@@ -3620,18 +4135,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>Помилка: %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>Помилка зберігання ресурсів: </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>Не вдалось звантажити поданий ресурс.</translation>
     </message>
@@ -3639,12 +4154,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>Система романізації Хепбьорна для хіраґани</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>Система романізації Хепбьорна для катакани</translation>
     </message>
@@ -3673,21 +4188,21 @@
         <translation type="obsolete">Перелік збігів (Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>Вперед</translation>
     </message>
@@ -3696,32 +4211,32 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>Вимовити слово (Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>Послати слово до основного вікна (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>Показує або ховає панель словника</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>Використайте шпильку, щоб вікно залишалось на екрані,
@@ -3732,8 +4247,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3741,17 +4256,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>Шлях</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>Піктограма</translation>
     </message>
@@ -3773,7 +4288,8 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>&amp;Додати…</translation>
     </message>
@@ -3782,7 +4298,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>&amp;Вилучити</translation>
     </message>
@@ -3860,7 +4377,7 @@
         <translation type="obsolete">Також використовуйте %GD1251% для CP1251 та %GDISO1% для ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>Програми</translation>
     </message>
@@ -3869,34 +4386,34 @@
         <translation type="obsolete">Будь які зовнішні програми. %GWORD% рядок буде замінено запитуваним словом. Слово також буде поміщено до стандартного уведення.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>Жива вимова від &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Цей сайт дозволяє людям записувати і ділитись вимовою слів. Ви можете прослухати їх за допомогою GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>Увімкнути вимову з Forvo</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>Ключ API:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
         <translation>Використання Forvo зараз вимагає ключ API. Залиште це поле порожнім, щоб використовувати типовий ключ, який може стати недоступний з часом, або зареєструйтесь на сайті, щоб одержати власний ключ.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>Дістаньте власний ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;тут&lt;/a&gt;, або залиште поле порожнім, щоб скористатись типовим.</translation>
     </message>
@@ -3926,79 +4443,89 @@
 %GDBIG5% для Big-5, %GDBIG5HKSCS% для Big5-HKSCS, %GDGBK% для GBK та GB18030, %GDSHIFTJIS% для Shift-JIS.</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>Будь-яка стороння програма. Рядок %GDWORD% буде замінено на запитуване слово. Якщо такого рядка немає, слово буде підбиратись зі стандартного джерела.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>Коди мов (виділяючи комою):</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>Перелік кодів мов, які б ви воліли мати. Наприклад: &quot;en, uk&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>Повний перелік кодів мов &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;тут&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>Транслітерація</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>Російська транслітерація</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>Грецька транслітерація</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>Німецька транслітерація</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>Білоруська транслітерація</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>Вмикає латинську абетку для японського письма</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>Японська романдзі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>Системи:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>Найпоширеніший спосіб транскрибування японської,
 яка ґрунтується на англійській фонології</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>Хепбьорн</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4009,12 +4536,12 @@
 Поки що не підтримується в GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>Ніхон-сікі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4025,75 +4552,77 @@
 Ще не реалізовано в GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>Кунрей-сікі</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>Складові азбуки:</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>Складова азбука японської хіраґани</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>Хіраґана</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>Складова азбука японської катакани</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>Катакана</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>Текст для вимови</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>(не доступно в портативній версії)</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>Вибрати теку</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>Підтвердження вилучення</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Вилучити теку &lt;b&gt;%1&lt;/b&gt; з переліку?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Вилучити сайт &lt;b&gt;%1&lt;/b&gt; з переліку?</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>Вилучити програму &lt;b&gt;%1&lt;/b&gt; зі списку?</translation>
     </message>
@@ -4223,22 +4752,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>Увімкнено</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>Наличка</translation>
     </message>
@@ -4246,7 +4775,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>Не вдалось здійснити пошук по деяких словниках.</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/vi_VN.ts goldendict-1.5.0~git20150923/locale/vi_VN.ts
--- goldendict-1.5.0~git20131003/locale/vi_VN.ts	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/vi_VN.ts	2015-09-23 08:26:24.000000000 +0000
@@ -9,7 +9,7 @@
     </message>
     <message>
         <source>GoldenDict dictionary lookup program, version </source>
-        <translation>Từ điển Vàng chương trình tra từ điển, phiên bản </translation>
+        <translation>Chương trình tra từ điển Từ điển Vàng, phiên bản </translation>
     </message>
     <message>
         <source>#.#</source>
@@ -21,7 +21,7 @@
     </message>
     <message>
         <source>Credits:</source>
-        <translation></translation>
+        <translation>Công trạng:</translation>
     </message>
     <message>
         <source>[Unknown]</source>
@@ -29,11 +29,11 @@
     </message>
     <message>
         <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bản quyền 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
     <message>
         <source>Based on Qt %1 (%2, %3 bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Dựa trên Qt %1 (%2, %3 bit) </translation>
     </message>
 </context>
 <context>
@@ -56,7 +56,7 @@
     </message>
     <message>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
-        <translation>&lt;h3 align=&quot;center&quot;&gt;Làm việc với popup&lt;/h3&gt;Để tra từ trong các ứng dụng đang hoạt động khác, trước tiên bạn cần kích hoạt &lt;i&gt;&quot;Chức năng popup quét&quot;&lt;/i&gt; trong &lt;b&gt;Tùy thích&lt;/b&gt;, sau đó bật lên bất cứ lúc nào bằng cách nhấn biểu tượng &apos;Popup&apos; , hay kích chuột phải vào biểu tượng trên khay hệ thống và chọn trong thực đơn hiện lên. </translation>
+        <translation>&lt;h3 align=&quot;center&quot;&gt;Làm việc với popup&lt;/h3&gt;Để tra từ trong các ứng dụng đang hoạt động khác, bạn cần kích hoạt &lt;i&gt;&quot;Chức năng quét popup&quot;&lt;/i&gt; trong &lt;b&gt;Tùy thích&lt;/b&gt;, sau đó bật lên bất cứ lúc nào bằng cách nhấn biểu tượng &apos;Popup&apos; , hay kích chuột phải vào biểu tượng trên khay hệ thống và chọn trong trình đơn hiện lên. </translation>
     </message>
     <message>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
@@ -64,7 +64,7 @@
     </message>
     <message>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
-        <translation>Sau đó chỉ cần chọn từ bạn muốn tra trong ứng dụng khác bởi con chuột (nhấp đúp chuột lên từ hay bôi đen nó bằng cách nhấn giữ chuột), và một cửa sổ sẽ bật ra để dịch nghĩa cho bạn.</translation>
+        <translation>Sau đó chỉ cần dùng chuột chọn từ bạn muốn tra trong ứng dụng khác (nhấp đúp chuột lên từ hay nhấn giữ chuột bôi đen), và một cửa sổ sẽ bật ra để dịch nghĩa cho bạn.</translation>
     </message>
     <message>
         <source>(untitled)</source>
@@ -72,19 +72,19 @@
     </message>
     <message>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
-        <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;Chào mừng đến với &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Để bắt đầu làm việc với chương trình, trước tiên hãy ghé thăm &lt;b&gt;Biên tập|Từ điển&lt;/b&gt; sau đó thêm một vài đường dẫn chứa từ điển để tìm kiếm các tập tin từ điển, cài đặt thêm các trang Wikipedia hay các nguồn khác, sắp xếp từ điển hay tạo các nhóm từ điển.&lt;p&gt;Và cuối cùng bạn đã sẵn sàng để tra từ rồi đấy! Bạn có thể tra trong cửa sổ này bằng cách sử dụng ô ở bên trái, hoặc bạn có thể &lt;a href=&quot;Working with popup&quot;&gt;tra từ trong các ứng dụng khác&lt;/a&gt;. &lt;p&gt;Để tùy chỉnh chương trình, hãy thử các tùy chọn khác nhau ở &lt;b&gt;Biên tập|Tùy thích&lt;/b&gt;. Tất cả các cài đặt đều có các mẹo hiện lên, hãy đọc chúng nếu bạn đang phân vân về một chức năng nào đó.&lt;p&gt;Nếu như bạn cần thêm giúp đỡ, có một vài câu hỏi, gợi ý hay chỉ là thắc mắc xem những người khác đang nghĩ gì, bạn đều được chào mừng đến với &lt;a href=&quot;http://goldendict.berlios.de/forum/&quot;&gt;forum&lt;/a&gt; của chương trình.&lt;p&gt;Hãy kiểm tra &lt;a href=&quot;http://goldendict.berlios.de/&quot;&gt;website&lt;/a&gt; của chương trình để cập nhật nếu muốn. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Cấp phép theo GPLv3 hoặc mới hơn.</translation>
+        <translation>&lt;h3 align=&quot;center&quot;&gt;Chào mừng đến với &lt;b&gt;Từ điển Vàng&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Để bắt đầu làm việc với chương trình, hãy mở &lt;b&gt;Biên tập|Từ điển&lt;/b&gt; để thêm đường dẫn chứa các tệp từ điển, thiết lập các trang Wikipedia và các nguồn khác, sắp xếp hay tạo các nhóm từ điển.&lt;p&gt;Bạn đã sẵn sàng tra nghĩa của từ rồi đấy! Bạn có thể tra trong cửa sổ này bằng cách sử dụng ô bên trái, hoặc bạn có thể &lt;a href=&quot;Working with popup&quot;&gt;tra từ trong các ứng dụng khác&lt;/a&gt;. &lt;p&gt;Để tùy chỉnh chương trình, hãy thử các tùy chọn khác nhau trong &lt;b&gt;Biên tập|Tùy thích&lt;/b&gt;. Tất cả các cài đặt đều có các mẹo hiện lên, hãy đọc chúng nếu bạn đang phân vân về một chức năng nào đó.&lt;p&gt;Nếu như bạn cần thêm giúp đỡ, có một vài câu hỏi, gợi ý hay chỉ là thắc mắc xem những người khác đang nghĩ gì, bạn đều được chào mừng đến với &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;diễn đàn&lt;/a&gt; của chương trình.&lt;p&gt;Hãy kiểm tra &lt;a href=&quot;http://goldendict.org/&quot;&gt;trang chủ&lt;/a&gt; của chương trình để cập nhật nếu muốn. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Cấp phép theo GPLv3 hoặc mới hơn.</translation>
     </message>
     <message>
         <source>(picture)</source>
-        <translation type="unfinished"></translation>
+        <translation>(hình ảnh)</translation>
     </message>
     <message>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở rộng bài viết</translation>
     </message>
     <message>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>Thu gọn bài viết</translation>
     </message>
 </context>
 <context>
@@ -111,11 +111,11 @@
     </message>
     <message>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở rộng bài viết</translation>
     </message>
     <message>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>Thu gọn bài viết</translation>
     </message>
 </context>
 <context>
@@ -126,11 +126,11 @@
     </message>
     <message>
         <source>about:blank</source>
-        <translation></translation>
+        <translation>about:blank</translation>
     </message>
     <message>
         <source>x</source>
-        <translation></translation>
+        <translation>x</translation>
     </message>
     <message>
         <source>Find:</source>
@@ -146,7 +146,7 @@
     </message>
     <message>
         <source>Ctrl+G</source>
-        <translation></translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
@@ -158,11 +158,11 @@
     </message>
     <message>
         <source>The referenced resource doesn&apos;t exist.</source>
-        <translation>Nguồn đã tham chiếu không tồn tại.</translation>
+        <translation>Nguồn tham chiếu không tồn tại.</translation>
     </message>
     <message>
         <source>&amp;Open Link</source>
-        <translation>Mở &amp;liên kết</translation>
+        <translation>Mở &amp;Liên kết</translation>
     </message>
     <message>
         <source>Open Link in New &amp;Tab</source>
@@ -170,7 +170,7 @@
     </message>
     <message>
         <source>Open Link in &amp;External Browser</source>
-        <translation>Mở liên kết trong &amp;Trình duyệt ngoài</translation>
+        <translation>Mở liên kết trong &amp;Trình duyệt</translation>
     </message>
     <message>
         <source>&amp;Look up &quot;%1&quot;</source>
@@ -190,139 +190,158 @@
     </message>
     <message>
         <source>Failed to run a player to play sound file: %1</source>
-        <translation>Chạy một trình chơi nhạc để chơi tập tin âm thanh: %1 thất bại</translation>
+        <translation>Lỗi chạy trình chơi nhạc khi chơi tệp âm thanh: %1</translation>
     </message>
     <message>
         <source>Failed to create temporary file.</source>
-        <translation>Tạo tập tin tạm thất bại.</translation>
+        <translation>Lỗi tạo tệp tạm.</translation>
     </message>
     <message>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
-        <translation>Tự động mở tập tin nguồn thất bại, thử mở thủ công: %1.</translation>
+        <translation>Lỗi tự động mở tệp nguồn, thử mở thủ công: %1.</translation>
     </message>
     <message>
         <source>The referenced resource failed to download.</source>
-        <translation>Tải xuống nguồn được tham chiếu thất bại.</translation>
+        <translation>Nguồn tham chiếu lỗi tải xuống.</translation>
     </message>
     <message>
         <source>Playing a non-WAV file</source>
-        <translation type="obsolete">Chơi một tập tin không phải WAV</translation>
+        <translation type="obsolete">Chơi một tệp không phải WAV</translation>
     </message>
     <message>
         <source>To enable playback of files different than WAV, please go to Edit|Preferences, choose the Audio tab and select &quot;Play via DirectShow&quot; there.</source>
-        <translation type="obsolete">Để bật khả năng chơi các tập tin không phải WAV, hãy vào Biên tập|Tùy thích, mở thẻ Âm thanh và chọn &quot;Chơi qua DirectShow&quot; ở đó.</translation>
+        <translation type="obsolete">Để bật khả năng chơi các tệp không phải WAV, hãy vào Biên tập|Tùy thích, mở thẻ Âm thanh và chọn &quot;Chơi qua DirectShow&quot; ở đó.</translation>
     </message>
     <message>
         <source>Highlight &amp;all</source>
-        <translation type="unfinished"></translation>
+        <translation>Tô &amp;sáng từ cần tìm</translation>
     </message>
     <message>
         <source>Resource</source>
-        <translation type="unfinished"></translation>
+        <translation>Nguồn</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Âm thanh</translation>
     </message>
     <message>
         <source>Definition: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Định nghĩa: %1</translation>
     </message>
     <message>
         <source>The referenced audio program doesn&apos;t exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chương trình âm thanh tham chiếu không có.</translation>
     </message>
     <message>
         <source>WARNING: %1</source>
-        <translation type="unfinished">CẢNH BÁO: %1</translation>
+        <translation>CẢNH BÁO: %1</translation>
     </message>
     <message>
         <source>&amp;Add &quot;%1&quot; to history</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Thêm &quot;%1&quot; vào lược sử</translation>
     </message>
     <message>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Định nghĩa trong từ điển &quot;%1&quot;: %2</translation>
     </message>
     <message>
         <source>Send &quot;%1&quot; to input line</source>
-        <translation type="unfinished"></translation>
+        <translation>Gửi &quot;%1&quot; đến dòng đầu vào</translation>
     </message>
     <message>
         <source>Picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Hình ảnh</translation>
     </message>
     <message>
         <source>Select Current Article</source>
-        <translation type="unfinished"></translation>
+        <translation>Chọn bài viết hiện tại</translation>
     </message>
     <message>
         <source>ERROR: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>LỖI: %1</translation>
     </message>
     <message>
         <source>Save sound</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu âm thanh</translation>
     </message>
     <message>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Các tệp âm thanh  (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
         <source>Save image</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu hình ảnh</translation>
     </message>
     <message>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Các tệp hình ảnh (*.bmp *.jpg *.png *.tif);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
         <source>Save &amp;image...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu &amp;hình ảnh...</translation>
     </message>
     <message>
         <source>Save s&amp;ound...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu â&amp;m thanh...</translation>
     </message>
     <message>
         <source>TTS Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>Giọng nói TTS</translation>
     </message>
     <message>
         <source>WARNING: FFmpeg Audio Player: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>CẢNH BÁO: Trình chơi âm thanh FFmpeg: %1</translation>
     </message>
     <message>
         <source>Copy as text</source>
-        <translation type="unfinished"></translation>
+        <translation>Chỉ sao chữ</translation>
     </message>
     <message>
         <source>Inspect</source>
-        <translation type="unfinished"></translation>
+        <translation>Inspect</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
     <message>
         <source>Video: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Video: %1</translation>
     </message>
 </context>
 <context>
     <name>BelarusianTranslit</name>
     <message>
         <source>Belarusian transliteration from latin to cyrillic (classic orthography)</source>
-        <translation type="unfinished"></translation>
+        <translation>Chuyển tự sang chữ Belarus từ ký tự Latin sang ký tự Kirin (kiểu chính tả cổ điển)</translation>
     </message>
     <message>
         <source>Belarusian transliteration from latin to cyrillic (school orthography)</source>
-        <translation type="unfinished"></translation>
+        <translation>Chuyển tự sang chữ Belarus từ ký tự Latin sang ký tự Kirin (kiểu chính tả chính thức)</translation>
     </message>
     <message>
         <source>Belarusian transliteration (smoothes out the difference
 between classic and school orthography in cyrillic)</source>
-        <translation type="unfinished"></translation>
+        <translation>Chuyển tự sang chữ Belarus (pha trộn giữa kiểu chính tả cổ điển và chính thức trong ký tự Kirin)</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <source>Proxy authentication required</source>
+        <translation>Yêu cầu xác thực proxy</translation>
+    </message>
+    <message>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>Cung cấp Tài khoản và Mật khẩu truy cập proxy</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Tài khoản:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Mật khẩu:</translation>
     </message>
 </context>
 <context>
@@ -345,11 +364,11 @@
     </message>
     <message>
         <source>From file...</source>
-        <translation>Từ tập tin...</translation>
+        <translation>Từ tệp...</translation>
     </message>
     <message>
         <source>Choose a file to use as group icon</source>
-        <translation>Chọn tập tin để sử dụng làm biểu tượng nhóm</translation>
+        <translation>Chọn tệp để sử dụng làm biểu tượng nhóm</translation>
     </message>
     <message>
         <source>Images</source>
@@ -357,7 +376,7 @@
     </message>
     <message>
         <source>All files</source>
-        <translation>Tất cả tập tin</translation>
+        <translation>Tất cả tệp</translation>
     </message>
     <message>
         <source>Error</source>
@@ -365,7 +384,7 @@
     </message>
     <message>
         <source>Can&apos;t read the specified image file.</source>
-        <translation>Không thể đọc tập tin ảnh được chỉ định.</translation>
+        <translation>Không thể đọc tệp ảnh được chỉ định.</translation>
     </message>
 </context>
 <context>
@@ -376,71 +395,172 @@
     </message>
     <message>
         <source>Are you sure you want to generate a set of groups based on language pairs?</source>
-        <translation>Bạn có chắc chắn muốn tạo một bộ các nhóm dựa trên các cặp ngôn ngữ?</translation>
+        <translation>Bạn có muốn tạo một bộ các nhóm dựa trên các cặp ngôn ngữ?</translation>
     </message>
     <message>
         <source>Dictionaries: </source>
-        <translation type="unfinished"></translation>
+        <translation>Từ điển:</translation>
     </message>
     <message>
         <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Kết hợp nhóm theo ngôn ngữ nguồn &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
         <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Kết hợp nhóm theo ngôn ngữ đích &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
         <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Tạo nhóm dịch song ngữ &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
         <source>Combine groups with &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Kết hợp nhóm với &quot;%1&quot;</translation>
     </message>
     <message>
         <source>Unassigned</source>
-        <translation type="unfinished"></translation>
+        <translation>Không xác định</translation>
+    </message>
+</context>
+<context>
+    <name>DictHeadwords</name>
+    <message>
+        <source>Search mode</source>
+        <translation>Kiểu tìm kiếm</translation>
+    </message>
+    <message>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>Xác định cách thức chuỗi bộ lọc sẽ được thể hiện</translation>
+    </message>
+    <message>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>Phân biệt hoa thường khi lọc</translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation>Khớp hoa thường</translation>
+    </message>
+    <message>
+        <source>Exports headwords to file</source>
+        <translation>Trích xuất danh sách từ ra tệp</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation>Trích xuất</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>Áp dụng kiểu lọc danh sách từ</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>Áp dụng</translation>
+    </message>
+    <message>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>Bộ lọc sẽ được áp dụng ngay vào danh sách từ</translation>
+    </message>
+    <message>
+        <source>Auto apply</source>
+        <translation>Tự động áp dụng</translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation>Bộ lọc:</translation>
+    </message>
+    <message>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translatorcomment>wildcard hoặc regular expression</translatorcomment>
+        <translation>Chuỗi bộ lọc (chuỗi cố định, ký tự đại diện hoặc biểu thức chính quy)</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Chữ</translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation>Wildcard</translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation>RegExp</translation>
+    </message>
+    <message>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>Tổng danh sách từ: %1, đã lọc: %2</translation>
+    </message>
+    <message>
+        <source>Save headwords to file</source>
+        <translation>Lưu danh sách từ vào tệp</translation>
+    </message>
+    <message>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>Các tệp văn bản (*.txt);;Tất cả tệp (*.*)</translation>
+    </message>
+    <message>
+        <source>Export headwords...</source>
+        <translation>Trích xuất danh sách từ...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Hủy bỏ</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Trợ giúp</translation>
     </message>
 </context>
 <context>
     <name>DictInfo</name>
     <message>
         <source>Total articles:</source>
-        <translation type="unfinished">Tổng số bài viết:</translation>
+        <translation>Tổng số bài viết:</translation>
     </message>
     <message>
         <source>Translates from:</source>
-        <translation type="unfinished">Dịch từ:</translation>
+        <translation>Dịch từ:</translation>
     </message>
     <message>
         <source>Total words:</source>
-        <translation type="unfinished">Tổng số từ:</translation>
+        <translation>Tổng số từ:</translation>
     </message>
     <message>
         <source>Translates to:</source>
-        <translation type="unfinished">Dịch sang:</translation>
+        <translation>Dịch sang:</translation>
     </message>
     <message>
         <source>Files comprising this dictionary:</source>
-        <translation type="unfinished">Tập tin chứa từ điển này:</translation>
+        <translation>Tệp chứa từ điển này:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mô tả:</translation>
     </message>
     <message>
         <source>Open folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở thư mục</translation>
     </message>
     <message>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Chỉnh sửa từ điển</translation>
     </message>
     <message>
         <source>Edit the dictionary via command:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chỉnh sửa từ điển với lệnh:
+%1</translation>
+    </message>
+    <message>
+        <source>Show all unique dictionary headwords</source>
+        <translation>Hiện tất cả danh sách từ của từ điển</translation>
+    </message>
+    <message>
+        <source>Headwords</source>
+        <translation>Danh sách từ</translation>
     </message>
 </context>
 <context>
@@ -451,6 +571,65 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <source>Url: </source>
+        <translation>Địa chỉ: </translation>
+    </message>
+    <message>
+        <source>Databases: </source>
+        <translation>Cơ sở dữ liệu: </translation>
+    </message>
+    <message>
+        <source>Search strategies: </source>
+        <translation>Cách tìm kiếm: </translation>
+    </message>
+    <message>
+        <source>Server databases</source>
+        <translation>Máy chủ cơ sở dữ liệu</translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <source>Enabled</source>
+        <translation>Bật</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Tên</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Địa chỉ</translation>
+    </message>
+    <message>
+        <source>Databases</source>
+        <translation>Cơ sở dữ liệu</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Biểu tượng</translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>Ngăn cách cơ sở dữ liệu bằng dấu phẩy
+(để trống hoặc &quot;*&quot; khớp mọi cơ sở dữ liệu)</translation>
+    </message>
+    <message>
+        <source>Strategies</source>
+        <translation>Cách thức</translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translatorcomment>prefix</translatorcomment>
+        <translation>Ngăn cách các cách thức tìm kiếm bằng dấu phẩy
+(để trống nghĩa là tìm theo &quot;tiền tố&quot;)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -462,23 +641,27 @@
     </message>
     <message>
         <source>Dictionary info</source>
-        <translation type="unfinished"></translation>
+        <translation>Thông tin từ điển</translation>
     </message>
     <message>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Sửa đổi từ điển</translation>
     </message>
     <message>
         <source>&amp;Dictionary Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Thanh Từ đ&amp;iển</translation>
     </message>
     <message>
         <source>Open dictionary folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở thư mục từ điển</translation>
     </message>
     <message>
         <source>Extended menu with all dictionaries...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở trình đơn với tất cả từ điển...</translation>
+    </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation>Danh sách từ của từ điển</translation>
     </message>
 </context>
 <context>
@@ -520,14 +703,83 @@
     <name>ExternalViewer</name>
     <message>
         <source>the viewer program name is empty</source>
-        <translation type="unfinished"></translation>
+        <translation>tên chương xem đang trống</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <source>None</source>
+        <translation>Không</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <source>Full-text search</source>
+        <translation>Tìm toàn văn</translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation>Toàn bộ từ</translation>
+    </message>
+    <message>
+        <source>Plain text</source>
+        <translation>Văn bản thuần</translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation>Ký tự đại diện</translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation>RegExp</translation>
+    </message>
+    <message>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>Khoảng cách tối đa giữa các từ (%1-%2):</translation>
+    </message>
+    <message>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>Số bài viết tối đa trên một từ điển (%1-%2):</translation>
+    </message>
+    <message>
+        <source>Articles found: </source>
+        <translation>Số bài viết tìm thấy: </translation>
+    </message>
+    <message>
+        <source>Now indexing: </source>
+        <translation>Đang chỉ mục: </translation>
+    </message>
+    <message>
+        <source>The search line must contains at least one word containing </source>
+        <translation>Dòng tìm kiếm phải chứa tối thiểu một từ có nhiều hơn </translation>
+    </message>
+    <message>
+        <source> or more symbols</source>
+        <translation> ký tự</translation>
+    </message>
+    <message>
+        <source>No dictionaries for full-text search</source>
+        <translation>Không có từ điển để tìm toàn văn</translation>
+    </message>
+    <message>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>Ký tự CJK trong chuỗi tìm không tương thích với kiểu tìm &quot;Toàn từ&quot; và &quot;Văn bản thuần&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <source>None</source>
+        <translation>Không</translation>
     </message>
 </context>
 <context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <source>XML parse error: %1 at %2,%3</source>
-        <translation>Lỗi phân tích XML: %1 ở %2,%3</translation>
+        <translation>Lỗi phân tích XML: %1 tại %2,%3</translation>
     </message>
     <message>
         <source>Added %1</source>
@@ -551,7 +803,54 @@
     </message>
     <message>
         <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
-        <translation>Hãy vào Biên tập|Từ điển|Nguồn|Forvo và nhập khóa API của riêng bạn để tắt lỗi này đi.</translation>
+        <translation>Hãy vào Biên tập|Từ điển|Nguồn|Forvo và nhập khóa API riêng để tắt lỗi này.</translation>
+    </message>
+</context>
+<context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <source>Search</source>
+        <translation>Tìm</translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation>Khớp hoa thường</translation>
+    </message>
+    <message>
+        <source>Mode:</source>
+        <translation>Kiểu:</translation>
+    </message>
+    <message>
+        <source>Articles found:</source>
+        <translation>Số bài viết tìm thấy:</translation>
+    </message>
+    <message>
+        <source>Available dictionaries in group:</source>
+        <translation>Từ điển có trong nhóm:</translation>
+    </message>
+    <message>
+        <source>Wait for indexing:</source>
+        <translation>Chờ chỉ mục:</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>Tổng:</translation>
+    </message>
+    <message>
+        <source>Indexed:</source>
+        <translation>Đã chỉ mục:</translation>
+    </message>
+    <message>
+        <source>Now indexing: None</source>
+        <translation>Đang chỉ mục: Không</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Hủy bỏ</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Trợ giúp</translation>
     </message>
 </context>
 <context>
@@ -590,11 +889,11 @@
     <name>Groups</name>
     <message>
         <source>Dictionaries available:</source>
-        <translation>Các từ điển có sẵn:</translation>
+        <translation>Các từ điển đã có:</translation>
     </message>
     <message>
         <source>Add selected dictionaries to group (Ins)</source>
-        <translation>Thêm những từ điển đã chọn vào nhóm (Chèn)</translation>
+        <translation>Thêm những từ điển đã chọn vào nhóm (Ins)</translation>
     </message>
     <message>
         <source>&gt;</source>
@@ -602,11 +901,11 @@
     </message>
     <message>
         <source>Ins</source>
-        <translation>Chèn</translation>
+        <translation>Ins</translation>
     </message>
     <message>
         <source>Remove selected dictionaries from group (Del)</source>
-        <translation>Xóa những từ điển đã chọn ra khỏi nhóm (Xóa)</translation>
+        <translation>Xóa những từ điển đã chọn ra khỏi nhóm (Del)</translation>
     </message>
     <message>
         <source>&lt;</source>
@@ -614,11 +913,11 @@
     </message>
     <message>
         <source>Del</source>
-        <translation>Xóa</translation>
+        <translation>Del</translation>
     </message>
     <message>
         <source>Groups:</source>
-        <translation>Các nhóm:</translation>
+        <translation>Nhóm:</translation>
     </message>
     <message>
         <source>Tab 2</source>
@@ -658,7 +957,7 @@
     </message>
     <message>
         <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
-        <translation>Kéo &amp;Thả các từ điển tới và từ các nhóm, di chuyển chúng vào trong các nhóm, sắp sếp lại các nhóm sử dụng con chuột của bạn.</translation>
+        <translation>Sử dụng chuột kéo &amp; thả các từ điển vào nhóm, khỏi nhóm và sắp sếp thứ tự trong nhóm.</translation>
     </message>
     <message>
         <source>Add group</source>
@@ -682,11 +981,11 @@
     </message>
     <message>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
-        <translation>Bạn có chắc chắn muốn xóa nhóm &lt;b&gt;%1&lt;/b&gt;?</translation>
+        <translation>Bạn có muốn xóa nhóm &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
         <source>Are you sure you want to remove all the groups?</source>
-        <translation>Bạn có chắc chắn muốn xóa hết các nhóm?</translation>
+        <translation>Bạn có muốn xóa hết các nhóm?</translation>
     </message>
     <message>
         <source>Create language-based groups</source>
@@ -694,30 +993,77 @@
     </message>
     <message>
         <source>Auto groups</source>
-        <translation>Các nhóm tự động</translation>
+        <translation>Tự động nhóm</translation>
+    </message>
+    <message>
+        <source>Group tabs</source>
+        <translation>Thẻ nhóm</translation>
+    </message>
+    <message>
+        <source>Open groups list</source>
+        <translation>Mở danh sách nhóm</translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <source>GoldenDict help</source>
+        <translation>Trợ giúp Từ điển Vàng</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Trang chủ</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Trở lại</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Tiếp tục</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Phóng to</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Thu nhỏ</translation>
+    </message>
+    <message>
+        <source>Normal Size</source>
+        <translation>Kích thước bình thường</translation>
+    </message>
+    <message>
+        <source>Content</source>
+        <translation>Nội dung</translation>
+    </message>
+    <message>
+        <source>Index</source>
+        <translation>Chỉ mục</translation>
     </message>
 </context>
 <context>
     <name>HistoryPaneWidget</name>
     <message>
         <source>&amp;Delete Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Xoá</translation>
     </message>
     <message>
         <source>Copy Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Sao chép</translation>
     </message>
     <message>
         <source>History:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lược sử:</translation>
     </message>
     <message>
         <source>%1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1/%2</translation>
     </message>
     <message>
         <source>History size: %1 entries out of maximum %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Số lược sử: %1 mục trên tối đa %2</translation>
     </message>
 </context>
 <context>
@@ -728,7 +1074,7 @@
     </message>
     <message>
         <source>%1 Morphology</source>
-        <translation>%1 Hình thái học</translation>
+        <translation>Hình thái học %1</translation>
     </message>
 </context>
 <context>
@@ -1465,7 +1811,7 @@
     </message>
     <message>
         <source>Vietnamese</source>
-        <translation></translation>
+        <translation>Tiếng Việt</translation>
     </message>
     <message>
         <source>Volapuk</source>
@@ -1505,81 +1851,81 @@
     </message>
     <message>
         <source>Traditional Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Simplified Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>Khác</translation>
     </message>
     <message>
         <source>Other Simplified Chinese dialects</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Traditional Chinese dialects</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Eastern-European languages</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Western-European languages</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Russian languages</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Japanese languages</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Baltic languages</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Greek languages</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Korean dialects</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Turkish dialects</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Other Thai dialects</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Tamazight</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Lojban</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>LoadDictionaries</name>
     <message>
         <source>Error loading dictionaries</source>
-        <translation>Lỗi khi tải từ điển</translation>
+        <translation>Lỗi nạp từ điển</translation>
     </message>
 </context>
 <context>
     <name>Main</name>
     <message>
         <source>Error in configuration file. Continue with default settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tệp cấu hình lỗi. Tiếp tục với thiết lập mặc định?</translation>
     </message>
 </context>
 <context>
@@ -1594,7 +1940,7 @@
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Tập tin</translation>
+        <translation>&amp;Tệp</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
@@ -1614,7 +1960,7 @@
     </message>
     <message>
         <source>H&amp;istory</source>
-        <translation>&amp;Lịch sử</translation>
+        <translation>&amp;Lược sử</translation>
     </message>
     <message>
         <source>Search Pane</source>
@@ -1626,7 +1972,7 @@
     </message>
     <message>
         <source>F3</source>
-        <translation type="unfinished">F3</translation>
+        <translation>F3</translation>
     </message>
     <message>
         <source>&amp;Groups...</source>
@@ -1666,11 +2012,11 @@
     </message>
     <message>
         <source>Ctrl+Q</source>
-        <translation></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <source>&amp;Forum</source>
-        <translation></translation>
+        <translation>&amp;Diễn đàn</translation>
     </message>
     <message>
         <source>&amp;Close To Tray</source>
@@ -1678,11 +2024,11 @@
     </message>
     <message>
         <source>Minimizes the window to tray</source>
-        <translation>Ẩn cửa sổ xuống khay hệ thống</translation>
+        <translation>Thu gọn cửa sổ xuống khay hệ thống</translation>
     </message>
     <message>
         <source>Ctrl+F4</source>
-        <translation></translation>
+        <translation>Ctrl+F4</translation>
     </message>
     <message>
         <source>&amp;Save Article</source>
@@ -1690,11 +2036,11 @@
     </message>
     <message>
         <source>Save Article</source>
-        <translation>Lưu bài viết</translation>
+        <translation>Lưu Bài viết</translation>
     </message>
     <message>
         <source>F2</source>
-        <translation></translation>
+        <translation>F2</translation>
     </message>
     <message>
         <source>&amp;Print</source>
@@ -1702,11 +2048,11 @@
     </message>
     <message>
         <source>Ctrl+P</source>
-        <translation></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <source>Page Set&amp;up</source>
-        <translation>&amp;Cài đặt Trang</translation>
+        <translation>&amp;Thiết lập Trang</translation>
     </message>
     <message>
         <source>Print Preview</source>
@@ -1714,11 +2060,11 @@
     </message>
     <message>
         <source>Rescan Files</source>
-        <translation type="obsolete">Quét lại các tập tin</translation>
+        <translation type="obsolete">Quét lại các tệp</translation>
     </message>
     <message>
         <source>Ctrl+F5</source>
-        <translation></translation>
+        <translation>Ctrl+F5</translation>
     </message>
     <message>
         <source>&amp;Clear</source>
@@ -1746,11 +2092,11 @@
     </message>
     <message>
         <source>Scan Popup</source>
-        <translation>Popup Quét</translation>
+        <translation>Quét Popup</translation>
     </message>
     <message>
         <source>Pronounce Word (Alt+S)</source>
-        <translation>Phát âm từ (Alt+S)</translation>
+        <translation>Phát âm (Alt+S)</translation>
     </message>
     <message>
         <source>Zoom In</source>
@@ -1762,19 +2108,19 @@
     </message>
     <message>
         <source>Normal Size</source>
-        <translation>Kích thước bình thường</translation>
+        <translation>Cỡ bình thường</translation>
     </message>
     <message>
         <source>Words Zoom In</source>
-        <translation>Phóng to từ</translation>
+        <translation>Phóng to Từ</translation>
     </message>
     <message>
         <source>Words Zoom Out</source>
-        <translation>Thu nhỏ từ</translation>
+        <translation>Thu nhỏ Từ</translation>
     </message>
     <message>
         <source>Words Normal Size</source>
-        <translation>Kích thước bình thường của từ</translation>
+        <translation>Cỡ Từ bình thường</translation>
     </message>
     <message>
         <source>Show &amp;Main Window</source>
@@ -1806,7 +2152,7 @@
     </message>
     <message>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
-        <translation>Khởi chạy cơ chế quản lý phím nóng thất bại. &lt;br&gt;Hãy chắc rằng XServer của bạn đã bật phần mở rộng RECORD.</translation>
+        <translation>Lỗi khởi chạy cơ chế quản lý phím tắt. &lt;br&gt;Hãy kiểm tra XServer đã bật phần mở rộng RECORD.</translation>
     </message>
     <message>
         <source>New Release Available</source>
@@ -1830,7 +2176,7 @@
     </message>
     <message>
         <source>Page Setup</source>
-        <translation>Cài đặt trang</translation>
+        <translation>Thiết lập Trang</translation>
     </message>
     <message>
         <source>No printer is available. Please install one first.</source>
@@ -1838,15 +2184,15 @@
     </message>
     <message>
         <source>Print Article</source>
-        <translation>In bài viết</translation>
+        <translation>In Bài viết</translation>
     </message>
     <message>
         <source>Save Article As</source>
-        <translation>Lưu bài viết như</translation>
+        <translation>Lưu Bài viết như</translation>
     </message>
     <message>
         <source>Html files (*.html *.htm)</source>
-        <translation type="obsolete">Tập tin Html (*.html *.htm)</translation>
+        <translation type="obsolete">Tệp Html (*.html *.htm)</translation>
     </message>
     <message>
         <source>Error</source>
@@ -1854,7 +2200,7 @@
     </message>
     <message>
         <source>Can&apos;t save article: %1</source>
-        <translation>Không thể lưu bài viết: %1</translation>
+        <translation>Không thể lưu Bài viết: %1</translation>
     </message>
     <message>
         <source>Close current tab</source>
@@ -1866,7 +2212,7 @@
     </message>
     <message>
         <source>Close all tabs except current</source>
-        <translation>Đóng hết thẻ trừ thẻ hiện tại</translation>
+        <translation>Đóng tất cả thẻ trừ thẻ hiện tại</translation>
     </message>
     <message>
         <source>Opened tabs</source>
@@ -1874,186 +2220,220 @@
     </message>
     <message>
         <source>New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Thẻ mới</translation>
     </message>
     <message>
         <source>Ctrl+T</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
         <source>&amp;Configuration Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Thư mục &amp;cấu hình</translation>
     </message>
     <message>
         <source>&amp;Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>Thanh Trì&amp;nh đơn</translation>
     </message>
     <message>
         <source>Found in Dictionaries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Từ điển tìm thấy:</translation>
     </message>
     <message>
         <source>Open Tabs List</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở danh sách Thẻ</translation>
     </message>
     <message>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
     <message>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bạn đã chọn ẩn thanh trình đơn. Dùng %1 để hiển thị lại.</translation>
     </message>
     <message>
         <source>Ctrl+M</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hiện</translation>
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Xuất</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>Ẩ&amp;n</translation>
     </message>
     <message>
         <source>Export history to file</source>
-        <translation type="unfinished"></translation>
+        <translation>Xuất lược sử sang tệp</translation>
     </message>
     <message>
         <source>Text files (*.txt);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tệp văn bản (*.txt);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
         <source>History export complete</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoàn tất xuất lược sử</translation>
     </message>
     <message>
         <source>Export error: </source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi trích xuất: </translation>
     </message>
     <message>
         <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+H</translation>
     </message>
     <message>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Nhậ&amp;p</translation>
     </message>
     <message>
         <source>Import history from file</source>
-        <translation type="unfinished"></translation>
+        <translation>Nhập lược sử từ tệp</translation>
     </message>
     <message>
         <source>Import error: invalid data in file</source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi nhập: dữ liệu tệp không đúng</translation>
     </message>
     <message>
         <source>History import complete</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoàn tất nhập lược sử</translation>
     </message>
     <message>
         <source>Import error: </source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi nhập: </translation>
     </message>
     <message>
         <source>Dictionary info</source>
-        <translation type="unfinished"></translation>
+        <translation>Thông tin từ điển</translation>
     </message>
     <message>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Chỉnh sửa từ điển</translation>
     </message>
     <message>
         <source>&amp;Search Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>Ô Tìm &amp;kiếm</translation>
     </message>
     <message>
         <source>&amp;Results Navigation Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>Ô Điều hướng Kết &amp;quả</translation>
     </message>
     <message>
         <source>Print Pre&amp;view</source>
-        <translation type="unfinished"></translation>
+        <translation>X&amp;em trước khi In</translation>
     </message>
     <message>
         <source>&amp;Rescan Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Q&amp;uét lại các tệp</translation>
     </message>
     <message>
         <source>&amp;New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Thẻ &amp;mới</translation>
     </message>
     <message>
         <source>&amp;Always on Top</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Luôn hiện</translation>
     </message>
     <message>
         <source>Always on Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Luôn hiện</translation>
     </message>
     <message>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <source>Menu Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Nút Trình đơn</translation>
     </message>
     <message>
         <source>Show Names in Dictionary &amp;Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiện tên từ điển trên Thanh &amp;Từ điển</translation>
     </message>
     <message>
         <source>Show Small Icons in &amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiện &amp;biểu tượng nhỏ trên Thanh công cụ</translation>
     </message>
     <message>
         <source>&amp;Navigation</source>
-        <translation type="unfinished"></translation>
+        <translation>Điều hướn&amp;g</translation>
     </message>
     <message>
         <source>The main window is set to be always on top.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cửa sổ chính luôn hiện trên các trình khác.</translation>
     </message>
     <message>
         <source>&amp;History Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>Thanh Lược &amp;sử</translation>
     </message>
     <message>
         <source>Accessibility API is not enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>API Khả năng truy cập không được bật</translation>
     </message>
     <message>
         <source>Article, Complete (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bài viết, Toàn bộ (*.html)</translation>
     </message>
     <message>
         <source>Article, HTML Only (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bài viết, chỉ HTML (*.html)</translation>
     </message>
     <message>
         <source>Saving article...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu bài viết...</translation>
     </message>
     <message>
         <source>Open dictionary folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở thư mục từ điển</translation>
+    </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation>Danh sách từ của từ điển</translation>
+    </message>
+    <message>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>Chuỗi tìm trong từ điển. Ký tự đại diện &apos;*&apos;, &apos;?&apos; và bộ ký tự &apos;[...] được sử dụng.
+Để tìm &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; dùng tách riêng &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Tìm kiếm</translation>
+    </message>
+    <message>
+        <source>Search in page</source>
+        <translation>Tìm trong trang</translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation>Tìm toàn văn</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
+        <source>GoldenDict reference</source>
+        <translation>Trợ giúp Từ điển Vàng</translation>
     </message>
 </context>
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
         <source>Dictionary file was tampered or corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>Tệp từ điển đã bị xáo trộn hoặc hỏng</translation>
     </message>
     <message>
         <source>Failed loading article from %1, reason: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi nạp bài viết từ %1, nguyên nhân: %2</translation>
     </message>
 </context>
 <context>
@@ -2086,7 +2466,7 @@
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Biểu tượng</translation>
     </message>
 </context>
 <context>
@@ -2100,12 +2480,8 @@
         <translation>Sắp xếp Từ điển:</translation>
     </message>
     <message>
-        <source>...</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Inactive (disabled) dictionaries:</source>
-        <translation>Các từ điển không hoạt động (đã tắt):</translation>
+        <translation>Các từ điển không hoạt động (đã vô hiệu hoá):</translation>
     </message>
     <message>
         <source>Dictionary information</source>
@@ -2133,23 +2509,31 @@
     </message>
     <message>
         <source>Files comprising this dictionary:</source>
-        <translation>Tập tin chứa từ điển này:</translation>
+        <translation>Tệp chứa từ điển này:</translation>
     </message>
     <message>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
-        <translation>Tùy chỉnh thứ tự bằng cách kéo và thả các mục trong nó. Thả các từ điển vào nhóm không hoạt động để tắt chúng.</translation>
+        <translation>Điều chỉnh thứ tự bằng cách kéo và thả các từ điển để di chuyển vị trí. Thả vào ô không hoạt động để vô hiệu hoá từ điển.</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mô tả:</translation>
     </message>
     <message>
         <source>Sort by name</source>
-        <translation type="unfinished"></translation>
+        <translation>Sắp xếp theo tên</translation>
     </message>
     <message>
         <source>Sort by languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Sắp xếp theo ngôn ngữ</translation>
+    </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation>Danh sách từ của từ điển</translation>
+    </message>
+    <message>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation>Từ điển hoạt động:%1, không hoạt động: %2</translation>
     </message>
 </context>
 <context>
@@ -2181,7 +2565,7 @@
         <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
-        <translation>Thông thường, bạn sẽ chuyển sang thẻ mới ngay khi nó
+        <translation>Mặc định, bạn sẽ chuyển sang thẻ mới ngay khi nó
 được mở. Với tùy chọn này, các thẻ mới sẽ được mở mà
 không cần chuyển ngay sang chúng.</translation>
     </message>
@@ -2204,7 +2588,7 @@
     <message>
         <source>When enabled, an icon appears in the sytem tray area which can be used
 to open main window and perform other tasks.</source>
-        <translation>Khi bật, một biểu tượng sẽ hiện trên khay hệ thống dùng để mở cửa sổ chính
+        <translation>Biểu tượng Từ điển Vàng sẽ hiện trên khay hệ thống dùng để mở cửa sổ chính
 và thực hiện một số tác vụ khác.</translation>
     </message>
     <message>
@@ -2214,8 +2598,7 @@
     <message>
         <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
-        <translation>Nếu bật tùy chọn này, ứng dụng sẽ khởi động thẳng xuống khay hệ thống
-mà không hiện cửa sổ chính.</translation>
+        <translation>Khi khởi chạy, ứng dụng sẽ thu gọn xuống khay hệ thống mà không hiện cửa sổ chính.</translation>
     </message>
     <message>
         <source>Start to system tray</source>
@@ -2224,11 +2607,11 @@
     <message>
         <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
-        <translation>Nếu bật tùy chọn này, khi tắt cửa sổ chính thì ứng dụng sẽ ẩn thay cho đóng hoàn toàn.</translation>
+        <translation>Ứng dụng sẽ thu gọn xuống khay hệ thống khi đóng cửa sổ chính.</translation>
     </message>
     <message>
         <source>Close to system tray</source>
-        <translation>Tắt xuống khay hệ thống</translation>
+        <translation>Đóng xuống khay hệ thống</translation>
     </message>
     <message>
         <source>Startup</source>
@@ -2256,7 +2639,7 @@
     </message>
     <message>
         <source>&amp;Scan Popup</source>
-        <translation>Popup &amp;Quét</translation>
+        <translation>&amp;Quét Popup</translation>
     </message>
     <message>
         <source>When enabled, a translation popup window would be shown each time
@@ -2270,31 +2653,30 @@
     </message>
     <message>
         <source>Enable scan popup functionality</source>
-        <translation>Kích hoạt chức năng popup quét</translation>
+        <translation>Kích hoạt chức năng quét popup</translation>
     </message>
     <message>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
-        <translation>Lựa chọn chế độ popup quét được bật theo mặc định hoặc không. Nếu được chọn,
-chương trình sẽ luôn luôn khởi động với popup quét được bật.</translation>
+        <translation>Chọn bật chế độ quét popup mặc định. Nếu chọn, chương trình sẽ khởi động
+với tính năng quét popup được bật.</translation>
     </message>
     <message>
         <source>Start with scan popup turned on</source>
-        <translation>Khởi động với popup quét được bật</translation>
+        <translation>Khởi động với quét popup được bật</translation>
     </message>
     <message>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
-        <translation>Với tùy chọn này được bật, popup sẽ chỉ hiện ra khi tất cả các phím đã
-chọn ở trạng thái nhấn khi sự lựa chọn từ thay đổi.</translation>
+        <translation>Khi chọn từ cần tra nghĩa, nhấn phím tắt đã chọn để hiện popup.</translation>
     </message>
     <message>
         <source>Only show popup when all selected keys are kept pressed:</source>
-        <translation>Chỉ hiện popup khi tất cả các phím đã chọn được nhấn giữ:</translation>
+        <translation>Chỉ hiện popup khi nhấn giữ phím tắt:</translation>
     </message>
     <message>
         <source>Left Ctrl only</source>
-        <translation>Chỉ Ctrl trái</translation>
+        <translation>Phím Ctrl trái</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
@@ -2302,7 +2684,7 @@
     </message>
     <message>
         <source>Right Shift only</source>
-        <translation>Chỉ Shift phải</translation>
+        <translation>Phím Shift phải</translation>
     </message>
     <message>
         <source>Right Shift</source>
@@ -2326,7 +2708,7 @@
     </message>
     <message>
         <source>Left Alt only</source>
-        <translation>Chỉ Alt trái</translation>
+        <translation>Phím Alt trái</translation>
     </message>
     <message>
         <source>Left Alt</source>
@@ -2342,7 +2724,7 @@
     </message>
     <message>
         <source>Right Alt only</source>
-        <translation>Chỉ Alt phải</translation>
+        <translation>Phím Alt phải</translation>
     </message>
     <message>
         <source>Right Alt</source>
@@ -2350,7 +2732,7 @@
     </message>
     <message>
         <source>Right Ctrl only</source>
-        <translation>Chỉ Ctrl phải</translation>
+        <translation>Phím Ctrl phải</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
@@ -2358,7 +2740,7 @@
     </message>
     <message>
         <source>Left Shift only</source>
-        <translation>Chỉ Shift trái</translation>
+        <translation>Phím Shift trái</translation>
     </message>
     <message>
         <source>Left Shift</source>
@@ -2370,29 +2752,28 @@
     </message>
     <message>
         <source>Win/Meta</source>
-        <translation></translation>
+        <translation>Win/Meta</translation>
     </message>
     <message>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
 be pressed shortly after the selection is done.</source>
-        <translation>Thông thường, để kích hoạt một popup bạn phải nhấn
-giữ phím được chọn khi bạn chọn từ. Nếu bật tùy chọn
-này, những phím được chọn cũng có thể được nhấn trong
-khoảng thời gian ngắn sau khi lựa chọn xong để bật popup.</translation>
+        <translation>Mặc định, để bật popup bạn phải nhấn giữ phím tắt
+khi bạn chọn từ cần tra. Tùy chọn này xác định thời
+gian phím tắt được nhấn sau khi chọn từ để bật popup.</translation>
     </message>
     <message>
         <source>Keys may also be pressed afterwards, within</source>
-        <translation>Các phím cũng có thể được ấn sau, trong khoảng</translation>
+        <translation>Phím tắt có thể được nhấn sau khi chọn từ</translation>
     </message>
     <message>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
-        <translation>Để tránh xác định nhầm, chương trình chỉ bắt phím
-sau khi lựa chọn xong trong khoảng giới hạn một vài
-giây được xác định ở đây.</translation>
+        <translation>Để tránh xác định nhầm, phím tắt chỉ được giám sát
+sau khi chọn từ hoàn tất trong vài giây giới hạn được
+xác định ở đây.</translation>
     </message>
     <message>
         <source>secs</source>
@@ -2400,19 +2781,19 @@
     </message>
     <message>
         <source>Hotkeys</source>
-        <translation>Phím nóng</translation>
+        <translation>Phím tắt</translation>
     </message>
     <message>
         <source>Use the following hotkey to show or hide the main window:</source>
-        <translation>Sử dụng phím nóng sau đây để hiện hay ẩn cửa sổ chính:</translation>
+        <translation>Sử dụng phím tắt sau đây để ẩn hiện cửa sổ chính:</translation>
     </message>
     <message>
         <source>Use the following hotkey to translate a word from clipboard:</source>
-        <translation>Sử dụng phím nóng sau đây để dịch từ clipboard:</translation>
+        <translation>Sử dụng phím tắt sau đây để dịch từ clipboard:</translation>
     </message>
     <message>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
-        <translation>Phím nóng hoạt động trên toàn bộ hệ thống và làm việc trên bất kỳ chương trình nào hay bên trong bất kỳ  phạm vi nào miễn là khi Từ điển Vàng đang chạy nền.</translation>
+        <translation>Phím tắt hoạt động toàn cục từ bất kỳ chương trình nào hay trong ngữ cảnh nào khi Từ điển Vàng đang chạy nền.</translation>
     </message>
     <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -2424,7 +2805,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Chú ý: Có vẻ như bạn đang chạy một phiên bản X.Org X.Server có phần mở rộng RECORD bị lỗi. Phím nóng trong Từ điển Vàng có thể không hoạt động được. Điều này phải được sửa bên trong server. Hãy ghé thăm &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;mục bug&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; và để lại một phản hồi nếu bạn muốn.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Chú ý: Có vẻ như bạn đang chạy một phiên bản X.Org X.Server có phần mở rộng RECORD bị lỗi. phím tắt trong Từ điển Vàng có thể không hoạt động được. Điều này phải được sửa bên trong server. Hãy ghé thăm &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;mục bug&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; và để lại một phản hồi nếu bạn muốn.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>&amp;Audio</source>
@@ -2436,11 +2817,11 @@
     </message>
     <message>
         <source>Auto-pronounce words in main window</source>
-        <translation>Tự động phát âm từ trong cửa sổ chính</translation>
+        <translation>Tự động phát âm trong cửa sổ chính</translation>
     </message>
     <message>
         <source>Auto-pronounce words in scan popup</source>
-        <translation>Tự động phát âm từ trong popup quét</translation>
+        <translation>Tự động phát âm trong quét popup</translation>
     </message>
     <message>
         <source>Playback</source>
@@ -2492,13 +2873,13 @@
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
-        <translation>Bật tùy chọn này sẽ khiến Từ điển Vàng chặn hầu hết các quảng cáo
-bằng cách không cho phép nội dung (ảnh, khung) không bắt nguồn từ trang
-bạn đang xem. Nếu một vài trang bị lỗi bởi tùy chọn này, hãy thử tắt đi.</translation>
+        <translation>Với tùy chọn này, Từ điển Vàng sẽ chặn các quảng cáo bằng cách
+ không cho phép nội dung (ảnh, khung) không bắt nguồn từ trang
+đang xem. Nếu một vài trang bị lỗi bởi tùy chọn này, hãy thử tắt đi.</translation>
     </message>
     <message>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
-        <translation>Không cho phép tải nội dung từ các trang khác (tắt hầu hết các quảng cáo)</translation>
+        <translation>Không cho phép tải nội dung từ các trang khác (tắt các quảng cáo)</translation>
     </message>
     <message>
         <source>When this is enabled, the program periodically
@@ -2506,10 +2887,8 @@
 is available for download. If it is so, the program
 informs the user about it and prompts to open a
 download page.</source>
-        <translation>Khi bật tùy chọn này, chương trình sẽ kiểm tra định kỳ
-các phiên bản mới cập nhật đã sẵn sàng để tải về hay
-chưa. Nếu có, chương trình sẽ báo cho người dùng biết
-và gợi ý mở trang tải về.</translation>
+        <translation>Chương trình sẽ kiểm tra định kỳ phiên bản cập nhật mới.
+ Nếu có, chương trình sẽ thông báo và gợi ý mở trang tải về.</translation>
     </message>
     <message>
         <source>Check for new program releases periodically</source>
@@ -2542,7 +2921,7 @@
     <message>
         <source>Use Windows native playback API. Limited to .wav files only,
 but works very well.</source>
-        <translation type="obsolete">Sử dụng API phát lại của Windows. Giới hạn chỉ cho các tập tin .wav,
+        <translation type="obsolete">Sử dụng API phát lại của Windows. Giới hạn chỉ cho các tệp .wav,
 nhưng hoạt động rất tốt.</translation>
     </message>
     <message>
@@ -2557,379 +2936,421 @@
     </message>
     <message>
         <source>Use any external program to play audio files</source>
-        <translation>Sử dụng bất cứ chương trình ngoài nào để phát tập tin âm thanh</translation>
+        <translation>Sử dụng bất cứ chương trình ngoài nào để phát tệp âm thanh</translation>
     </message>
     <message>
         <source>Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ẩn thẻ trên thanh thẻ chính nếu chỉ duy nhất một thẻ được mở.</translation>
     </message>
     <message>
         <source>Hide single tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Ẩn thẻ đơn nhất</translation>
     </message>
     <message>
         <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mặc định, nhấn phím ESC dùng để chuyển vào ô tìm kiếm.
+Tuỳ chọn này sẽ ẩn cửa sổ chính khi nhấn phím ESC.</translation>
     </message>
     <message>
         <source>ESC key hides main window</source>
-        <translation type="unfinished"></translation>
+        <translation>Nhấn phím ESC để ẩn cửa sổ chính</translation>
     </message>
     <message>
         <source>Send translated word to main window instead of to show it in popup window</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiện từ đã dịch trên cửa sổ chính thay vì cửa sổ popup</translation>
     </message>
     <message>
         <source>Send translated word to main window</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiện từ đã dịch trên cửa sổ chính</translation>
     </message>
     <message>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cho phép nghe phát âm từ các từ điển trực tuyến dựa trên Flash
+hay các bổ trợ web khác. Phần bổ trợ phải được cài đặt.</translation>
     </message>
     <message>
         <source>Enable web plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>Bật bổ trợ web</translation>
     </message>
     <message>
         <source>Ad&amp;vanced</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nâng cao</translation>
     </message>
     <message>
         <source>ScanPopup extra technologies</source>
-        <translation type="unfinished"></translation>
+        <translation>Kỹ thuật Quét Popup bổ sung</translation>
     </message>
     <message>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng kỹ thuật IAccessibleEx để đọc từ dưới con trỏ.
+Kỹ thuật này chỉ làm việc với một vài chương trình hỗ trợ
+(VD: Internet Explorer 9).
+Không cần bật chức năng này nếu bạn không cần dùng.</translation>
     </message>
     <message>
         <source>Use &amp;IAccessibleEx</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng &amp;IAccessibleEx</translation>
     </message>
     <message>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng kỹ thuật UI Automation để đọc từ dưới con trỏ.
+Kỹ thuật này chỉ làm việc với một vài chương trình hỗ trợ.
+Không cần bật chức năng này nếu bạn không cần dùng.</translation>
     </message>
     <message>
         <source>Use &amp;UIAutomation</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng  &amp;UIAutomation</translation>
     </message>
     <message>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng thông điệp Từ điển Vàng đặc biệt để đọc từ dưới con trỏ.
+Kỹ thuật này chỉ làm việc với một vài chương trình hỗ trợ.
+Không cần bật chức năng này nếu bạn không cần dùng.</translation>
     </message>
     <message>
         <source>Use &amp;GoldenDict message</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng thông điệp Từ điển &amp;Vàng</translation>
     </message>
     <message>
         <source>Ctrl-Tab navigates tabs in MRU order</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl-Tab điều hướng các thẻ theo trình tự MRU</translation>
     </message>
     <message>
         <source>Babylon</source>
-        <translation type="unfinished"></translation>
+        <translation>Babylon</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Lược sử</translation>
     </message>
     <message>
         <source>Turn this option on to store history of the translated words</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu lược sử các từ đã tra</translation>
     </message>
     <message>
         <source>Store &amp;history</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu &amp;Lược sử</translation>
     </message>
     <message>
         <source>Articles</source>
-        <translation type="unfinished"></translation>
+        <translation>Bài viết</translation>
     </message>
     <message>
         <source>Turn this option on to always expand optional parts of articles</source>
-        <translation type="unfinished"></translation>
+        <translation>Luôn mở rộng phần tuỳ chọn của bài viết</translation>
     </message>
     <message>
         <source>Expand optional &amp;parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Mở rộng phần tuỳ &amp;chọn</translation>
     </message>
     <message>
         <source>Turn this option on if you want to select words by single mouse click</source>
-        <translation type="unfinished"></translation>
+        <translation>Chọn từ bằng cách nhấp chuột đơn</translation>
     </message>
     <message>
         <source>Select word by single click</source>
-        <translation type="unfinished"></translation>
+        <translation>Chọn từ với nhấp chuột đơn</translation>
     </message>
     <message>
         <source>Add-on style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiểu bổ sung:</translation>
     </message>
     <message>
         <source>Specify the maximum number of entries to keep in history.</source>
-        <translation type="unfinished"></translation>
+        <translation>Xác định tối đa số mục lưu trong lược sử.</translation>
     </message>
     <message>
         <source>Maximum history size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Số lược sử tối đa:</translation>
     </message>
     <message>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tần suất lưu lược sử. Nếu đặt giá trị 0, lược sử sẽ được lưu khi thoát chương trình.</translation>
     </message>
     <message>
         <source>Save every</source>
-        <translation type="unfinished"></translation>
+        <translation>Lưu mỗi</translation>
     </message>
     <message>
         <source>minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>phút</translation>
     </message>
     <message>
         <source>Modern</source>
-        <translation type="unfinished"></translation>
+        <translation>Modern</translation>
     </message>
     <message>
         <source>Lingoes</source>
-        <translation type="unfinished"></translation>
+        <translation>Lingoes</translation>
     </message>
     <message>
         <source>Lingoes-Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Lingoes-Blue</translation>
     </message>
     <message>
         <source>Play audio files via FFmpeg(libav) and libao</source>
-        <translation type="unfinished"></translation>
+        <translation>Phát các tệp âm thanh thông qua FFmpeg(libav) và libao</translation>
     </message>
     <message>
         <source>Use internal player</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng trình phát âm thanh tích hợp</translation>
     </message>
     <message>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Một vài trang mạng nhận ra Từ điển Vàng thông qua phần đầu giao thức HTTP
+và chặn truy vấn. Bật tính năng này để không chèn định danh vào truy vấn HTTP.</translation>
     </message>
     <message>
         <source>Do not identify GoldenDict in HTTP headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Không định danh Từ điển Vàng trong phần đầu giao thức HTTP</translation>
     </message>
     <message>
         <source>Select this option to automatic collapse big articles</source>
-        <translation type="unfinished"></translation>
+        <translation>Tự động thu gọn các bài viết dài</translation>
     </message>
     <message>
         <source>Collapse articles more than</source>
-        <translation type="unfinished"></translation>
+        <translation>Thu gọn bài viết dài hơn</translation>
     </message>
     <message>
         <source>symbols</source>
-        <translation type="unfinished"></translation>
+        <translation>ký tự</translation>
     </message>
     <message>
         <source>Adjust this value to avoid huge context menus.</source>
-        <translation type="unfinished"></translation>
+        <translation>Điều chỉnh giá trị này để tránh các trình đơn ngữ cảnh dài.</translation>
     </message>
     <message>
         <source>Context menu dictionaries limit:</source>
-        <translation type="unfinished"></translation>
+        <translation>Trình đơn ngữ cảnh các từ điển giới hạn:</translation>
     </message>
     <message>
         <source>Articles longer than this size will be collapsed</source>
-        <translation type="unfinished"></translation>
+        <translation>Bài viết dài hơn cỡ này sẽ được thu gọn</translation>
+    </message>
+    <message>
+        <source>System proxy</source>
+        <translation>Proxy của hệ thống</translation>
+    </message>
+    <message>
+        <source>Custom proxy</source>
+        <translation>Proxy tuỳ chỉnh</translation>
+    </message>
+    <message>
+        <source>Custom settings</source>
+        <translation>Thiết lập tuỳ chỉnh</translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation>Tìm toàn văn</translation>
+    </message>
+    <message>
+        <source>Allow full-text search for:</source>
+        <translation>Các dạng cho phép tìm toàn văn:</translation>
+    </message>
+    <message>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>Không tìm trong từ điển chứa nhiều hơn</translation>
+    </message>
+    <message>
+        <source>articles (0 - unlimited)</source>
+        <translation>bài viết (0 - không giới hạn)</translation>
+    </message>
+    <message>
+        <source>Help language</source>
+        <translation>Ngôn ngữ trợ giúp</translation>
     </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Âm thanh</translation>
     </message>
     <message>
         <source>Plain Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Văn bản thuần</translation>
     </message>
     <message>
         <source>Html</source>
-        <translation type="unfinished"></translation>
+        <translation>Html</translation>
     </message>
     <message>
         <source>Prefix Match</source>
-        <translation type="unfinished"></translation>
+        <translation>Khớp Tiền tố</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Không biết</translation>
     </message>
 </context>
 <context>
     <name>Programs::RunInstance</name>
     <message>
         <source>No program name was given.</source>
-        <translation type="unfinished"></translation>
+        <translation>Không tên chương trình nào được gán.</translation>
     </message>
     <message>
         <source>The program has crashed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chương trình đã bị hỏng.</translation>
     </message>
     <message>
         <source>The program has returned exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chương trình trả về mã thoát %1.</translation>
     </message>
 </context>
 <context>
     <name>ProgramsModel</name>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished">Bật</translation>
+        <translation>Bật</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Loại</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Tên</translation>
+        <translation>Tên</translation>
     </message>
     <message>
         <source>Command Line</source>
-        <translation type="unfinished"></translation>
+        <translation>Dòng lệnh</translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Biểu tượng</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Article loading error</source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi nạp bài viết</translation>
     </message>
     <message>
         <source>Article decoding error</source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi giải mã bài viết</translation>
     </message>
     <message>
         <source>avformat_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>avformat_alloc_context() đã lỗi.</translation>
     </message>
     <message>
         <source>av_malloc() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>av_malloc() đã lỗi.</translation>
     </message>
     <message>
         <source>avio_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>avio_alloc_context() đã lỗi.</translation>
     </message>
     <message>
         <source>avformat_open_input() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>avformat_open_input() đã lỗi: %1.</translation>
     </message>
     <message>
         <source>avformat_find_stream_info() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>avformat_find_stream_info() đã lỗi: %1.</translation>
     </message>
     <message>
         <source>Could not find audio stream.</source>
-        <translation type="unfinished"></translation>
+        <translation>Không thể tìm luồng âm thanh.</translation>
     </message>
     <message>
         <source>Codec [id: %1] not found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bộ giải nén [id: %1] không tìm thấy.</translation>
     </message>
     <message>
         <source>avcodec_open2() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>avcodec_open2() đã lỗi: %1.</translation>
     </message>
     <message>
         <source>Cannot find usable audio output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Không tìm thấy thiết bị xuất âm thanh.</translation>
     </message>
     <message>
         <source>Unsupported sample format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Định dạng mẫu không hỗ trợ.</translation>
     </message>
     <message>
         <source>ao_open_live() failed: </source>
-        <translation type="unfinished"></translation>
+        <translation>ao_open_live() đã lỗi: </translation>
     </message>
     <message>
         <source>No driver.</source>
-        <translation type="unfinished"></translation>
+        <translation>Không có bộ điều khiển.</translation>
     </message>
     <message>
         <source>This driver is not a live output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bộ điều khiển này không phải là thiết bị xuất trực tiếp.</translation>
     </message>
     <message>
         <source>A valid option key has an invalid value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Khoá tuỳ chọn đúng có một giá trị không xác định.</translation>
     </message>
     <message>
         <source>Cannot open the device: %1, channels: %2, rate: %3, bits: %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>Không thể mở thiết bị: %1, kênh: %2, rate: %3, bits: %4.</translation>
     </message>
     <message>
         <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lỗi không biết.</translation>
     </message>
     <message>
         <source>avcodec_alloc_frame() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>avcodec_alloc_frame() đã lỗi.</translation>
     </message>
 </context>
 <context>
     <name>QuickFilterLine</name>
     <message>
         <source>Dictionary search/filter (Ctrl+F)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tìm/lọc từ điển (Ctrl+F)</translation>
     </message>
     <message>
         <source>Quick Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Tìm Nhanh</translation>
     </message>
     <message>
         <source>Clear Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Xoá ô Tìm kiếm</translation>
     </message>
 </context>
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
         <source>ERROR: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>LỖI: %1</translation>
     </message>
     <message>
         <source>Resource saving error: </source>
-        <translation type="unfinished"></translation>
+        <translation>Nguồn lưu lỗi: </translation>
     </message>
     <message>
         <source>The referenced resource failed to download.</source>
-        <translation type="unfinished">Tải xuống nguồn được tham chiếu thất bại.</translation>
+        <translation>Nguồn tham chiếu lỗi tải xuống.</translation>
     </message>
 </context>
 <context>
     <name>Romaji</name>
     <message>
         <source>Hepburn Romaji for Hiragana</source>
-        <translation>Hepburn Romaj cho Hiragana</translation>
+        <translation>Hệ Latinh hoá Hepburn của bảng chữ Hiragana</translation>
     </message>
     <message>
         <source>Hepburn Romaji for Katakana</source>
-        <translation>Hepburn Romaji cho Katakana</translation>
+        <translation>Hệ Latinh hoá Hepburn của bảng chữ Katakana</translation>
     </message>
 </context>
 <context>
@@ -2963,7 +3384,7 @@
     </message>
     <message>
         <source>Pronounce Word (Alt+S)</source>
-        <translation>Phát âm từ (Alt+S)</translation>
+        <translation>Phát âm (Alt+S)</translation>
     </message>
     <message>
         <source>Alt+S</source>
@@ -2971,29 +3392,29 @@
     </message>
     <message>
         <source>Shows or hides the dictionary bar</source>
-        <translation>Hiện hay ẩn thanh từ điển</translation>
+        <translation>Ẩn/Hiện thanh Từ điển</translation>
     </message>
     <message>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
-        <translation>Sử dụng để đính cửa sổ lại làm nó sẽ giữ trên màn hình, có thể
-thay đổi kích thước hay quản lý theo cách khác tùy bạn.</translation>
+        <translation>Đính cửa sổ trên màn hình, có thể thay đổi kích thước hay
+quản lý theo nhiều cách khác.</translation>
     </message>
     <message>
         <source>Send word to main window (Alt+W)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiện từ đã tra trên cửa sổ chính (Atl+W)</translation>
     </message>
     <message>
         <source>Alt+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Atl+W</translation>
     </message>
     <message>
         <source>Back</source>
-        <translation type="unfinished">Trở lại</translation>
+        <translation>Trở lại</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished">Tiếp tục</translation>
+        <translation>Tiếp tục</translation>
     </message>
     <message>
         <source>GoldenDict</source>
@@ -3001,7 +3422,7 @@
     </message>
     <message>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
 </context>
 <context>
@@ -3016,18 +3437,18 @@
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Biểu tượng</translation>
     </message>
 </context>
 <context>
     <name>Sources</name>
     <message>
         <source>Files</source>
-        <translation>Tập tin</translation>
+        <translation>Tệp</translation>
     </message>
     <message>
         <source>Paths to search for the dictionary files:</source>
-        <translation>Đường dẫn để tìm kiếm tập tin từ điển:</translation>
+        <translation>Đường dẫn chứa tệp từ điển:</translation>
     </message>
     <message>
         <source>&amp;Add...</source>
@@ -3039,7 +3460,7 @@
     </message>
     <message>
         <source>Re&amp;scan now</source>
-        <translation>&amp;Quét lại bây giờ</translation>
+        <translation>&amp;Quét lại</translation>
     </message>
     <message>
         <source>Sound Dirs</source>
@@ -3047,7 +3468,7 @@
     </message>
     <message>
         <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
-        <translation>Làm từ điển từ hàng tá các tập tin âm thanh bằng cách thêm đường dẫn ở đây:</translation>
+        <translation>Thêm đường dẫn chứa các tệp âm thanh để tạo từ điển âm thanh:</translation>
     </message>
     <message>
         <source>Morphology</source>
@@ -3055,7 +3476,7 @@
     </message>
     <message>
         <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
-        <translation>Đường dẫn đến thư mục chứa từ điển  Hunspell/Myspell:</translation>
+        <translation>Đường dẫn đến thư mục chứa từ điển Hunspell/Myspell:</translation>
     </message>
     <message>
         <source>&amp;Change...</source>
@@ -3092,7 +3513,7 @@
     </message>
     <message>
         <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
-        <translation>Bất kỳ trang nào. Một chuỗi %GDWORD% sẽ được thay thế bởi từ truy vấn:</translation>
+        <translation>Có thể dùng bất kỳ trang nào. Chuỗi %GDWORD% sẽ được thay thế bởi từ truy vấn:</translation>
     </message>
     <message>
         <source>Alternatively, use %GD1251% for CP1251, %GDISO1% for ISO 8859-1.</source>
@@ -3118,7 +3539,7 @@
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
-        <translation>Sử dụng Forvo hiện tại cần khóa API. Để trống ô này để sử
+        <translation>Sử dụng Forvo yêu cầu một khóa API. Để trống ô này để sử
 dụng khóa mặc định mà có thể không còn hiệu lực trong tương
 lai, đăng ký trên trang chủ để lấy khóa của chính bạn.</translation>
     </message>
@@ -3174,7 +3595,7 @@
     </message>
     <message>
         <source>Japanese Romaji</source>
-        <translation>Phiên âm (Romaji) tiếng Nhật</translation>
+        <translation>Phiên âm Latinh tiếng Nhật</translation>
     </message>
     <message>
         <source>Systems:</source>
@@ -3195,7 +3616,7 @@
 kana writing systems. Standardized as ISO 3602
 
 Not implemented yet in GoldenDict.</source>
-        <translation>Hệ thống thông thường nhất, có mối quan hệ một-đổi-một tới hệ viết kana. Tiêu chuẩn ISO 3602
+        <translation>Hệ thống thông dụng nhất, có mối quan hệ tương ứng tới hệ viết kana. Tiêu chuẩn ISO 3602
 
 Chưa được bổ sung trong Từ điển Vàng.</translation>
     </message>
@@ -3259,132 +3680,141 @@
     </message>
     <message>
         <source>Programs</source>
-        <translation type="unfinished"></translation>
+        <translation>Chương trình</translation>
     </message>
     <message>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>Xoá chương trình &lt;b&gt;%1&lt;/b&gt; khỏi danh sách?</translation>
     </message>
     <message>
         <source>Belarusian transliteration</source>
-        <translation type="unfinished"></translation>
+        <translation>Chuyển tự sang tiếng Belarus</translation>
     </message>
     <message>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lấy khoá của bạn &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;tại đây&lt;/a&gt; hoặc để trống để dùng mặc định.</translation>
     </message>
     <message>
         <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
 %GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lựa chọn dùng %GD1251% for CP1251, %GDISO1%...%GDISO16% với ISO 8859-1...ISO 8859-16 tương ứng,
+%GDBIG5% với Big-5, %GDBIG5HKSCS% với Big5-HKSCS, %GDGBK% với GBK và GB18030, %GDSHIFTJIS% với Shift-JIS.</translation>
     </message>
     <message>
         <source>Text to Speech</source>
-        <translation type="unfinished"></translation>
+        <translation>Text to Speech</translation>
     </message>
     <message>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dùng mọi chương trình ngoài. Chuỗi %GDWORD% thay từ truy vấn. Nếu chuỗi không có, từ sẽ được đưa vào đầu vào tiêu chuẩn.</translation>
+    </message>
+    <message>
+        <source>DICT servers</source>
+        <translation>Máy chủ DICT</translation>
+    </message>
+    <message>
+        <source>DICT servers:</source>
+        <translation>Máy chủ DICT:</translation>
     </message>
 </context>
 <context>
     <name>StylesComboBox</name>
     <message>
         <source>None</source>
-        <translation type="unfinished">Không</translation>
+        <translation>Không</translation>
     </message>
 </context>
 <context>
     <name>TextToSpeechSource</name>
     <message>
         <source>Selected voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>Thêm vào phương tiện giọng nói đã chọn:</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Thêm</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished">Xóa &amp;bỏ</translation>
+        <translation>Xóa &amp;bỏ</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Xem trước</translation>
     </message>
     <message>
         <source>Available voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>Các phương tiện giọng nói có thể:</translation>
     </message>
     <message>
         <source>Text to be previewed:</source>
-        <translation type="unfinished"></translation>
+        <translation>Xem trước văn bản:</translation>
     </message>
     <message>
         <source>Type text to be previewed here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nhập văn bản ở đây.</translation>
     </message>
     <message>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Xem trước</translation>
     </message>
     <message>
         <source>No TTS voice available</source>
-        <translation type="unfinished"></translation>
+        <translation>Không có giọng nói TTS</translation>
     </message>
     <message>
         <source>Confirm removal</source>
-        <translation type="unfinished">Xác nhận xóa bỏ</translation>
+        <translation>Xác nhận xóa bỏ</translation>
     </message>
     <message>
         <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>Xoá phương tiện giọng nói &lt;b&gt;%1&lt;/b&gt; khỏi danh sách?</translation>
     </message>
     <message>
         <source>Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</source>
-        <translation type="unfinished"></translation>
+        <translation>Không tìm thấy giọng nói TTS. &lt;br&gt;Hãy kiểm tra tối thiểu một phương tiện TTS được cài đặt.</translation>
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished">Tùy thích</translation>
+        <translation>Tùy thích</translation>
     </message>
     <message>
         <source>Volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>Âm lượng:</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tốc độ:</translation>
     </message>
 </context>
 <context>
     <name>TranslateBox</name>
     <message>
         <source>Type a word or phrase to search dictionaries</source>
-        <translation type="unfinished"></translation>
+        <translation>Nhập một từ hoặc cụm từ để tra từ điển</translation>
     </message>
     <message>
         <source>Drop-down</source>
-        <translation type="unfinished"></translation>
+        <translation>Nút xổ</translation>
     </message>
 </context>
 <context>
     <name>VoiceEnginesModel</name>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished">Bật</translation>
+        <translation>Bật</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Tên</translation>
+        <translation>Tên</translation>
     </message>
     <message>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation>Id</translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Biểu tượng</translation>
     </message>
 </context>
 <context>
@@ -3403,21 +3833,21 @@
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Biểu tượng</translation>
     </message>
 </context>
 <context>
     <name>WordFinder</name>
     <message>
         <source>Failed to query some dictionaries.</source>
-        <translation>Truy vấn một vài từ điển thất bại.</translation>
+        <translation>Lỗi truy vấn một vài từ điểni.</translation>
     </message>
 </context>
 <context>
     <name>WordList</name>
     <message>
         <source>WARNING: %1</source>
-        <translation type="unfinished">CẢNH BÁO: %1</translation>
+        <translation>CẢNH BÁO: %1</translation>
     </message>
 </context>
 </TS>
diff -Nru goldendict-1.5.0~git20131003/locale/zh_CN.ts goldendict-1.5.0~git20150923/locale/zh_CN.ts
--- goldendict-1.5.0~git20131003/locale/zh_CN.ts	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/zh_CN.ts	2015-09-23 08:26:24.000000000 +0000
@@ -29,7 +29,7 @@
         <translation>[未知]</translation>
     </message>
     <message>
-        <location filename="../about.cc" line="32"/>
+        <location filename="../about.cc" line="34"/>
         <source>Based on Qt %1 (%2, %3 bit)</source>
         <translation>基于 Qt %1 (%2, %3 位)</translation>
     </message>
@@ -42,62 +42,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../article_maker.cc" line="238"/>
+        <location filename="../article_maker.cc" line="268"/>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
         <translation>然后只要将鼠标指针停留在你想要进行抓词查询的单词上，程序就会在弹出式窗口中显示释义。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="231"/>
+        <location filename="../article_maker.cc" line="261"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;使用屏幕取词功能&lt;/h3&gt;&lt;p style=&quot;text-indent:2em&quot;&gt;如要从其它程序中直接进行抓词查询，需要首先在&lt;b&gt;首选项&lt;/b&gt;中启用“屏幕取词功能”，然后点击上面的“弹出菜单”图标，或者右键点击系统托盘图标后从弹出菜单中选定“屏幕取词”以激活此功能。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="152"/>
+        <location filename="../article_maker.cc" line="153"/>
         <source>Expand article</source>
         <translation>展开文章</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="158"/>
+        <location filename="../article_maker.cc" line="159"/>
         <source>Collapse article</source>
         <translation>收起文章</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="187"/>
+        <location filename="../article_maker.cc" line="188"/>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>在 &lt;b&gt;%2&lt;/b&gt; 群组中找不到 &lt;b&gt;%1&lt;/b&gt; 的可用翻译。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="229"/>
+        <location filename="../article_maker.cc" line="259"/>
         <source>Working with popup</source>
         <translation>使用屏幕取词功能</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="322"/>
+        <location filename="../article_maker.cc" line="353"/>
         <source>(untitled)</source>
         <translation>（未命名）</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="211"/>
+        <location filename="../article_maker.cc" line="241"/>
         <source>Welcome!</source>
         <translation>欢迎使用！</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="241"/>
+        <location filename="../article_maker.cc" line="271"/>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
         <translation>然后只要用鼠标指针选定你要进行抓词查询的词（双击单词或者用鼠标拖拉选定），程序就会在弹出式窗口中显示释义。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="192"/>
+        <location filename="../article_maker.cc" line="193"/>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>在 &lt;b&gt;%1&lt;/b&gt; 群组中找不到可用的翻译。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="213"/>
+        <location filename="../article_maker.cc" line="243"/>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
         <translation>&lt;h3 align=&quot;center&quot;&gt;欢迎使用 &lt;b&gt;GoldenDict&lt;/b&gt; 词典程序！&lt;/h3&gt;&lt;p style=&quot;text-indent:2em&quot;&gt;使用时请首先打开&lt;b&gt;编辑 | 词典&lt;/b&gt;菜单以添加并扫描含有词典文件的目录，添加维基百科网站查询或其它资源，调整词典排序或创建新的词典群组。&lt;p style=&quot;text-indent:2em&quot;&gt;这些设置都完成以后，就可以开始使用了。你可以使用左侧的查询面板，或者&lt;a href=&quot;使用屏幕取词功能&quot;&gt;直接从其它程序中抓词查询&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要改变设置，可以在&lt;b&gt;编辑 | 首选项&lt;/b&gt;菜单中查看一下可用的系统设置。所有的设置都有鼠标指针提示信息，如果有不明之处，请仔细阅读提示信息。&lt;p style=&quot;text-indent:2em&quot;&gt;如果你需要更多帮助，有任何疑问、建议，或者仅仅想了解其他人的想法，欢迎访问此程序的&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;官方论坛&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;访问此程序的&lt;a href=&quot;http://goldendict.org/&quot;&gt;官方网站&lt;/a&gt;以获取更新。&lt;p style=&quot;text-indent:2em&quot;&gt;(c) 2008-2013 Konstantin Isakov. 授权基于 GPLv3 或更高版本。</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="336"/>
+        <location filename="../article_maker.cc" line="367"/>
         <source>(picture)</source>
         <translation>（图片）</translation>
     </message>
@@ -105,37 +105,37 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../article_maker.cc" line="591"/>
+        <location filename="../article_maker.cc" line="634"/>
         <source>Expand article</source>
         <translation>展开文章</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="594"/>
+        <location filename="../article_maker.cc" line="637"/>
         <source>From </source>
         <translation>来自</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="599"/>
+        <location filename="../article_maker.cc" line="642"/>
         <source>Collapse article</source>
         <translation>收起文章</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="616"/>
+        <location filename="../article_maker.cc" line="659"/>
         <source>Query error: %1</source>
         <translation>查询错误：%1</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="715"/>
+        <location filename="../article_maker.cc" line="765"/>
         <source>Close words: </source>
         <translation>相近词条：</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="786"/>
+        <location filename="../article_maker.cc" line="836"/>
         <source>Compound expressions: </source>
         <translation>复合短语：</translation>
     </message>
     <message>
-        <location filename="../article_maker.cc" line="814"/>
+        <location filename="../article_maker.cc" line="864"/>
         <source>Individual words: </source>
         <translation>单个词汇：</translation>
     </message>
@@ -143,7 +143,7 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../articleview.ui" line="74"/>
+        <location filename="../articleview.ui" line="142"/>
         <source>x</source>
         <translation>x</translation>
     </message>
@@ -153,52 +153,54 @@
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1552"/>
+        <location filename="../articleview.cc" line="1793"/>
         <source>Failed to run a player to play sound file: %1</source>
         <translation>没有可用的播放器，无法打开音频文件：%1</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="109"/>
+        <location filename="../articleview.ui" line="85"/>
+        <location filename="../articleview.ui" line="177"/>
         <source>&amp;Next</source>
         <translation>后一个(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="64"/>
+        <location filename="../articleview.ui" line="132"/>
         <source>Find:</source>
         <translation>查找：</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>The referenced resource failed to download.</source>
         <translation>所引用的资源下载失败。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1570"/>
+        <location filename="../articleview.cc" line="1811"/>
         <source>Failed to create temporary file.</source>
         <translation>创建临时文件失败。</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="116"/>
+        <location filename="../articleview.ui" line="184"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1278"/>
+        <location filename="../articleview.cc" line="1519"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>查找 &quot;%1&quot;(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="36"/>
+        <location filename="../articleview.ui" line="54"/>
         <source>about:blank</source>
         <translation>about:blank</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="92"/>
+        <location filename="../articleview.ui" line="71"/>
+        <location filename="../articleview.ui" line="160"/>
         <source>&amp;Previous</source>
         <translation>前一个(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1286"/>
+        <location filename="../articleview.cc" line="1527"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>在新标签页中查找 &quot;%1&quot;(&amp;N)</translation>
     </message>
@@ -207,58 +209,58 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="928"/>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1158"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>所引用的资源不存在。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1223"/>
+        <location filename="../articleview.cc" line="1464"/>
         <source>&amp;Open Link</source>
         <translation>打开链接(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="152"/>
+        <location filename="../articleview.ui" line="220"/>
         <source>&amp;Case Sensitive</source>
         <translation>区分大小写(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1581"/>
+        <location filename="../articleview.cc" line="1822"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>自动打开资源文件时失败，请尝试手动打开：%1.</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1311"/>
+        <location filename="../articleview.cc" line="1552"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>在 %2 中查找 &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="147"/>
+        <location filename="../articleview.cc" line="206"/>
         <source>Select Current Article</source>
         <translation>选择当前文章</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="153"/>
+        <location filename="../articleview.cc" line="212"/>
         <source>Copy as text</source>
         <translation>复制为文本</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="159"/>
+        <location filename="../articleview.cc" line="218"/>
         <source>Inspect</source>
         <translation>审查元素</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1319"/>
+        <location filename="../articleview.cc" line="1560"/>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
         <translation>在 %2 中查找 &quot;%1&quot; 并使用新标签页(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1229"/>
+        <location filename="../articleview.cc" line="1470"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>在新标签页中打开链接(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1236"/>
+        <location filename="../articleview.cc" line="1477"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>在外部浏览器中打开链接(&amp;E)</translation>
     </message>
@@ -271,78 +273,79 @@
         <translation type="obsolete">要播放非 WAV 文件，请进入 编辑|首选项，选取音频选项卡，选择“通过 DirectShow 播放”。</translation>
     </message>
     <message>
-        <location filename="../articleview.ui" line="129"/>
+        <location filename="../articleview.ui" line="197"/>
         <source>Highlight &amp;all</source>
         <translation>高亮所有结果(&amp;a)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="688"/>
+        <location filename="../articleview.cc" line="891"/>
         <source>Resource</source>
         <translation>资源</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="693"/>
+        <location filename="../articleview.cc" line="896"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="698"/>
+        <location filename="../articleview.cc" line="901"/>
         <source>TTS Voice</source>
         <translation>TTS 音频</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="703"/>
+        <location filename="../articleview.cc" line="906"/>
         <source>Picture</source>
         <translation>图片</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="710"/>
+        <location filename="../articleview.cc" line="913"/>
         <source>Video</source>
         <translatorcomment>视频: %1</translatorcomment>
         <translation>视频</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="719"/>
+        <location filename="../articleview.cc" line="922"/>
         <source>Video: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="736"/>
+        <location filename="../articleview.cc" line="939"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>定义：&quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="740"/>
+        <location filename="../articleview.cc" line="943"/>
         <source>Definition: %1</source>
         <translation>定义：%1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="968"/>
+        <location filename="../articleview.cc" line="1198"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>引用的音频播放程序不存在。</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1071"/>
+        <location filename="../articleview.cc" line="1118"/>
+        <location filename="../articleview.cc" line="1312"/>
         <source>ERROR: %1</source>
         <translation>错误： %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1463"/>
+        <location filename="../articleview.cc" line="1704"/>
         <source>Save sound</source>
         <translation>保存音频文件</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1465"/>
+        <location filename="../articleview.cc" line="1706"/>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
         <translation>音频文件 (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;所有文件 (*.*) </translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1478"/>
+        <location filename="../articleview.cc" line="1719"/>
         <source>Save image</source>
         <translation>保存图片</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1480"/>
+        <location filename="../articleview.cc" line="1721"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>图片文件 (*.bmp *.jpg *.png *.tif);;所有文件 (*.*)</translation>
     </message>
@@ -351,33 +354,33 @@
         <translation type="obsolete">资源保存失败：</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1251"/>
+        <location filename="../articleview.cc" line="1492"/>
         <source>Save &amp;image...</source>
         <translation>保存图片(&amp;I)...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1259"/>
+        <location filename="../articleview.cc" line="1500"/>
         <source>Save s&amp;ound...</source>
         <translation>保存音频文件(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1291"/>
+        <location filename="../articleview.cc" line="1532"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>将 &quot;%1&quot; 发送到输入框</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1297"/>
-        <location filename="../articleview.cc" line="1329"/>
+        <location filename="../articleview.cc" line="1538"/>
+        <location filename="../articleview.cc" line="1570"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>将 &quot;%1&quot; 添加到历史(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1604"/>
+        <location filename="../articleview.cc" line="1845"/>
         <source>WARNING: %1</source>
         <translation>警告： %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="1611"/>
+        <location filename="../articleview.cc" line="1852"/>
         <source>WARNING: FFmpeg Audio Player: %1</source>
         <translation>警告： 内置播放器：%1</translation>
     </message>
@@ -402,6 +405,29 @@
     </message>
 </context>
 <context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../authentication.ui" line="14"/>
+        <source>Proxy authentication required</source>
+        <translation>代理服务器要求身份验证</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="20"/>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>您需要提供代理服务器的用户名和密码</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="30"/>
+        <source>Username:</source>
+        <translation>用户名：</translation>
+    </message>
+    <message>
+        <location filename="../authentication.ui" line="40"/>
+        <source>Password:</source>
+        <translation>密码：</translation>
+    </message>
+</context>
+<context>
     <name>DictGroupWidget</name>
     <message>
         <location filename="../dictgroupwidget.ui" line="14"/>
@@ -502,6 +528,119 @@
     </message>
 </context>
 <context>
+    <name>DictHeadwords</name>
+    <message>
+        <location filename="../dictheadwords.ui" line="27"/>
+        <source>Search mode</source>
+        <translation>搜索模式</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="33"/>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation type="unfinished">在这里可以选择过滤器字符串的执行方式</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="40"/>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>若勾选则大小写不同的词条均计入总数</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="43"/>
+        <source>Match case</source>
+        <translation>区分大小写</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="53"/>
+        <source>Exports headwords to file</source>
+        <translation>将词条导出至文件</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="56"/>
+        <source>Export</source>
+        <translation>导出</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="79"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="89"/>
+        <source>OK</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="101"/>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>点击此按钮启用词条列表过滤器</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="104"/>
+        <source>Apply</source>
+        <translation>过滤</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="117"/>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>若勾选则词条列表过滤器的修改即时生效</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="120"/>
+        <source>Auto apply</source>
+        <translation>自动过滤</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="127"/>
+        <source>Filter:</source>
+        <translation>过滤器：</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.ui" line="134"/>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>过滤器字符串（可以是固定的字符串、通配符或者正则表达式）</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="31"/>
+        <source>Text</source>
+        <translation>纯文本</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="32"/>
+        <source>Wildcards</source>
+        <translation>通配符</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="33"/>
+        <source>RegExp</source>
+        <translation>正则表达式</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="235"/>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>总共有%1个不同的词条，已过滤%2个</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="252"/>
+        <source>Save headwords to file</source>
+        <translation>保存词条至文件</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="254"/>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>文本文件 (*.txt);;所有文件 (*.*)</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Export headwords...</source>
+        <translation>导出词条...</translation>
+    </message>
+    <message>
+        <location filename="../dictheadwords.cc" line="278"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
+<context>
     <name>DictInfo</name>
     <message>
         <location filename="../dictinfo.ui" line="29"/>
@@ -544,6 +683,16 @@
         <translation>描述：</translation>
     </message>
     <message>
+        <location filename="../dictinfo.ui" line="263"/>
+        <source>Show all unique dictionary headwords</source>
+        <translation>显示所有不同的词条</translation>
+    </message>
+    <message>
+        <location filename="../dictinfo.ui" line="266"/>
+        <source>Headwords</source>
+        <translation>词条</translation>
+    </message>
+    <message>
         <location filename="../dictinfo.cc" line="29"/>
         <source>Edit the dictionary via command:
 %1</source>
@@ -559,6 +708,74 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <location filename="../dictserver.cc" line="248"/>
+        <source>Url: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="249"/>
+        <source>Databases: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="250"/>
+        <source>Search strategies: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dictserver.cc" line="254"/>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <location filename="../sources.cc" line="762"/>
+        <source>Enabled</source>
+        <translation type="unfinished">已启用</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="764"/>
+        <source>Name</source>
+        <translation type="unfinished">名称</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="766"/>
+        <source>Address</source>
+        <translation type="unfinished">地址</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="768"/>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="770"/>
+        <source>Strategies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="772"/>
+        <source>Icon</source>
+        <translation type="unfinished">图标</translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="805"/>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources.cc" line="808"/>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
@@ -575,17 +792,22 @@
         <translation>编辑此群组</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="135"/>
+        <location filename="../dictionarybar.cc" line="136"/>
         <source>Dictionary info</source>
         <translation>词典信息</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="139"/>
+        <location filename="../dictionarybar.cc" line="141"/>
+        <source>Dictionary headwords</source>
+        <translation>词典词条</translation>
+    </message>
+    <message>
+        <location filename="../dictionarybar.cc" line="143"/>
         <source>Open dictionary folder</source>
         <translation>打开词典文件夹</translation>
     </message>
     <message>
-        <location filename="../dictionarybar.cc" line="146"/>
+        <location filename="../dictionarybar.cc" line="150"/>
         <source>Edit dictionary</source>
         <translation>编辑词典信息</translation>
     </message>
@@ -598,8 +820,8 @@
 <context>
     <name>EditDictionaries</name>
     <message>
-        <location filename="../editdictionaries.cc" line="42"/>
-        <location filename="../editdictionaries.cc" line="222"/>
+        <location filename="../editdictionaries.cc" line="45"/>
+        <location filename="../editdictionaries.cc" line="242"/>
         <source>&amp;Dictionaries</source>
         <translation>词典(&amp;D)</translation>
     </message>
@@ -609,33 +831,33 @@
         <translation>词典</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="108"/>
+        <location filename="../editdictionaries.cc" line="126"/>
         <source>Accept</source>
         <translation>接受</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="110"/>
+        <location filename="../editdictionaries.cc" line="128"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="104"/>
+        <location filename="../editdictionaries.cc" line="122"/>
         <source>Sources changed</source>
         <translation>词典文件所在目录已变更</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="41"/>
+        <location filename="../editdictionaries.cc" line="44"/>
         <source>&amp;Sources</source>
         <translation>词典来源(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="43"/>
-        <location filename="../editdictionaries.cc" line="225"/>
+        <location filename="../editdictionaries.cc" line="46"/>
+        <location filename="../editdictionaries.cc" line="245"/>
         <source>&amp;Groups</source>
         <translation>群组(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../editdictionaries.cc" line="105"/>
+        <location filename="../editdictionaries.cc" line="123"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>某些词典文件的所在目录已变更，是否接受变更？</translation>
     </message>
@@ -649,6 +871,92 @@
     </message>
 </context>
 <context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="68"/>
+        <source>None</source>
+        <translation>无</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="140"/>
+        <source>Full-text search</source>
+        <translation>全文搜索</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="147"/>
+        <source>Whole words</source>
+        <translation>全字匹配</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="148"/>
+        <source>Plain text</source>
+        <translation>纯文本</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="149"/>
+        <source>Wildcards</source>
+        <translation>通配符</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="150"/>
+        <source>RegExp</source>
+        <translation>正则表达式</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="155"/>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>最大词间距 (%1-%2)：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="164"/>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>每个词典最大词条数 (%1-%2)：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="187"/>
+        <location filename="../fulltextsearch.cc" line="297"/>
+        <location filename="../fulltextsearch.cc" line="385"/>
+        <source>Articles found: </source>
+        <translation>搜索到的词条：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="266"/>
+        <source>Now indexing: </source>
+        <translation>正在索引：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="310"/>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation type="unfinished">不能使用“全字匹配”模式或者“纯文本”模式搜索包含CJK字符的字符串</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="319"/>
+        <source>The search line must contains at least one word containing </source>
+        <translation>搜索关键词至少包含</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="320"/>
+        <source> or more symbols</source>
+        <translation>个或更多字符</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.cc" line="332"/>
+        <source>No dictionaries for full-text search</source>
+        <translation>没有可供全文搜索的词典</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <location filename="../fulltextsearch.cc" line="61"/>
+        <source>None</source>
+        <translation>无</translation>
+    </message>
+</context>
+<context>
     <name>Forvo::ForvoArticleRequest</name>
     <message>
         <location filename="../forvo.cc" line="224"/>
@@ -687,6 +995,69 @@
     </message>
 </context>
 <context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <location filename="../fulltextsearch.ui" line="26"/>
+        <location filename="../fulltextsearch.ui" line="189"/>
+        <source>Search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="37"/>
+        <source>Match case</source>
+        <translation>区分大小写</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="46"/>
+        <source>Mode:</source>
+        <translation>模式：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="94"/>
+        <source>Articles found:</source>
+        <translation>搜索到的词条：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="116"/>
+        <source>Available dictionaries in group:</source>
+        <translation>群组中的可用词典：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="122"/>
+        <source>Wait for indexing:</source>
+        <translation>等候索引：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="235"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-indexable:</source>
+        <translation type="obsolete">不可索引：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="143"/>
+        <source>Total:</source>
+        <translation>总计：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="150"/>
+        <source>Indexed:</source>
+        <translation>已索引：</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="167"/>
+        <source>Now indexing: None</source>
+        <translation>正在索引：无</translation>
+    </message>
+    <message>
+        <location filename="../fulltextsearch.ui" line="215"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+</context>
+<context>
     <name>GermanTranslit</name>
     <message>
         <location filename="../german.cc" line="48"/>
@@ -751,27 +1122,37 @@
         <translation>标签页 2</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="160"/>
+        <location filename="../groups.cc" line="175"/>
         <source>Are you sure you want to remove all the groups?</source>
         <translation>确定移除全部群组吗？</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="147"/>
+        <location filename="../groups.cc" line="162"/>
         <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
         <translation>确定要移除&lt;b&gt;%1&lt;/b&gt;群组吗？</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="146"/>
+        <location filename="../groups.cc" line="29"/>
+        <source>Group tabs</source>
+        <translation type="unfinished">群组标签页</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="35"/>
+        <source>Open groups list</source>
+        <translation>打开群组列表</translation>
+    </message>
+    <message>
+        <location filename="../groups.cc" line="161"/>
         <source>Remove group</source>
         <translation>移除群组</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="134"/>
+        <location filename="../groups.cc" line="149"/>
         <source>Rename group</source>
         <translation>重命名群组</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="135"/>
+        <location filename="../groups.cc" line="150"/>
         <source>Give a new name for the group:</source>
         <translation>为群组起一个新名字：</translation>
     </message>
@@ -786,7 +1167,7 @@
         <translation>添加群组(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="108"/>
+        <location filename="../groups.cc" line="123"/>
         <source>Add group</source>
         <translation>添加群组</translation>
     </message>
@@ -811,13 +1192,13 @@
         <translation>移除词典群组</translation>
     </message>
     <message>
-        <location filename="../groups.cc" line="109"/>
+        <location filename="../groups.cc" line="124"/>
         <source>Give a name for the new group:</source>
         <translation>为新群组命名：</translation>
     </message>
     <message>
         <location filename="../groups.ui" line="186"/>
-        <location filename="../groups.cc" line="159"/>
+        <location filename="../groups.cc" line="174"/>
         <source>Remove all groups</source>
         <translation>移除全部群组</translation>
     </message>
@@ -863,6 +1244,54 @@
     </message>
 </context>
 <context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <location filename="../helpwindow.cc" line="64"/>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="71"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="73"/>
+        <source>Back</source>
+        <translation type="unfinished">回退</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="75"/>
+        <source>Forward</source>
+        <translation type="unfinished">前进</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="80"/>
+        <source>Zoom In</source>
+        <translation type="unfinished">放大</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="82"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished">缩小</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="84"/>
+        <source>Normal Size</source>
+        <translation type="unfinished">正常大小</translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="127"/>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpwindow.cc" line="128"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HistoryPaneWidget</name>
     <message>
         <location filename="../historypanewidget.cc" line="21"/>
@@ -893,12 +1322,12 @@
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../hunspell.cc" line="242"/>
+        <location filename="../hunspell.cc" line="277"/>
         <source>Spelling suggestions: </source>
         <translation>拼写建议：</translation>
     </message>
     <message>
-        <location filename="../hunspell.cc" line="776"/>
+        <location filename="../hunspell.cc" line="868"/>
         <source>%1 Morphology</source>
         <translation>%1 构词法</translation>
     </message>
@@ -906,12 +1335,12 @@
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../sources.cc" line="1133"/>
+        <location filename="../sources.cc" line="1342"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1131"/>
+        <location filename="../sources.cc" line="1340"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
@@ -1951,7 +2380,7 @@
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../loaddictionaries.cc" line="226"/>
+        <location filename="../loaddictionaries.cc" line="266"/>
         <source>Error loading dictionaries</source>
         <translation>读取词典出错</translation>
     </message>
@@ -1959,7 +2388,7 @@
 <context>
     <name>Main</name>
     <message>
-        <location filename="../main.cc" line="152"/>
+        <location filename="../main.cc" line="214"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>配置文件错误，使用默认配置并继续？</translation>
     </message>
@@ -1967,32 +2396,32 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="359"/>
+        <location filename="../mainwindow.ui" line="594"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="413"/>
+        <location filename="../mainwindow.ui" line="429"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="322"/>
+        <location filename="../mainwindow.ui" line="341"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="337"/>
+        <location filename="../mainwindow.ui" line="356"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1134"/>
+        <location filename="../mainwindow.cc" line="1242"/>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="121"/>
+        <location filename="../mainwindow.cc" line="154"/>
         <source>Back</source>
         <translation>回退</translation>
     </message>
@@ -2001,103 +2430,108 @@
         <translation type="obsolete">打印预览</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1105"/>
+        <location filename="../mainwindow.cc" line="1213"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>词典数：%1，文章数：%2，词条数：%3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="86"/>
+        <location filename="../mainwindow.ui" line="95"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../mainwindow.ui" line="78"/>
         <source>&amp;File</source>
         <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="93"/>
+        <location filename="../mainwindow.ui" line="102"/>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="367"/>
-        <location filename="../mainwindow.cc" line="311"/>
+        <location filename="../mainwindow.ui" line="136"/>
+        <source>Search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="383"/>
+        <location filename="../mainwindow.cc" line="347"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3012"/>
+        <location filename="../mainwindow.cc" line="3260"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="148"/>
+        <location filename="../mainwindow.cc" line="181"/>
         <source>Scan Popup</source>
         <translation>屏幕取词</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="370"/>
+        <location filename="../mainwindow.ui" line="386"/>
         <source>Quit from application</source>
         <translation>退出程序</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="389"/>
+        <location filename="../mainwindow.ui" line="405"/>
         <source>&amp;Close To Tray</source>
         <translation>关闭至系统托盘(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3013"/>
+        <location filename="../mainwindow.cc" line="3261"/>
         <source>Can&apos;t save article: %1</source>
         <translation>无法保存文章：%1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="175"/>
+        <location filename="../mainwindow.cc" line="208"/>
         <source>Zoom In</source>
         <translation>放大</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="319"/>
+        <location filename="../mainwindow.ui" line="338"/>
         <source>&amp;Dictionaries...</source>
         <translation>词典(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="353"/>
+        <location filename="../mainwindow.ui" line="372"/>
         <source>&amp;About</source>
         <translation>关于(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="381"/>
+        <location filename="../mainwindow.ui" line="397"/>
         <source>&amp;Forum</source>
         <translation>论坛(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="425"/>
+        <location filename="../mainwindow.ui" line="441"/>
         <source>&amp;Print</source>
         <translation>打印(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="423"/>
         <source>&amp;Save Article</source>
         <translation>保存文章(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2998"/>
+        <location filename="../mainwindow.cc" line="3246"/>
         <source>Save Article As</source>
         <translation>文章另存为</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="428"/>
+        <location filename="../mainwindow.ui" line="444"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="373"/>
+        <location filename="../mainwindow.ui" line="389"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="392"/>
+        <location filename="../mainwindow.ui" line="408"/>
         <source>Minimizes the window to tray</source>
         <translation>最小化窗口至系统托盘</translation>
     </message>
@@ -2106,27 +2540,27 @@
         <translation type="obsolete">重新扫描文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="436"/>
+        <location filename="../mainwindow.ui" line="452"/>
         <source>Page Set&amp;up</source>
         <translation>页面设置(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="345"/>
+        <location filename="../mainwindow.ui" line="364"/>
         <source>&amp;Homepage</source>
         <translation>主页(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2670"/>
+        <location filename="../mainwindow.cc" line="2918"/>
         <source>New Release Available</source>
         <translation>有新版本可用</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up:</source>
         <translation>查找：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="181"/>
+        <location filename="../mainwindow.cc" line="214"/>
         <source>Zoom Out</source>
         <translation>缩小</translation>
     </message>
@@ -2135,43 +2569,43 @@
         <translation type="obsolete">群组...(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="307"/>
+        <location filename="../mainwindow.cc" line="343"/>
         <source>Show &amp;Main Window</source>
         <translation>显示主窗口(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="375"/>
         <source>About GoldenDict</source>
         <translation>关于 GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2676"/>
+        <location filename="../mainwindow.cc" line="2924"/>
         <source>Download</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2906"/>
+        <location filename="../mainwindow.cc" line="3154"/>
         <source>Page Setup</source>
         <translation>页面设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="225"/>
-        <location filename="../mainwindow.cc" line="1116"/>
+        <location filename="../mainwindow.cc" line="261"/>
+        <location filename="../mainwindow.cc" line="1224"/>
         <source>Look up in:</source>
         <translation>查找于：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="185"/>
+        <location filename="../mainwindow.cc" line="218"/>
         <source>Normal Size</source>
         <translation>正常大小</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2533"/>
+        <location filename="../mainwindow.cc" line="2781"/>
         <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
         <translation>初始化热键监视机制失败。&lt;br&gt;请确保你的 XServer 已启用 RECORD 扩展。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2671"/>
+        <location filename="../mainwindow.cc" line="2919"/>
         <source>Version &lt;b&gt;%1&lt;/b&gt; of GoldenDict is now available for download.&lt;br&gt;Click &lt;b&gt;Download&lt;/b&gt; to get to the download page.</source>
         <translation>有新版 GoldenDict 可用，版本为 &lt;b&gt;%1&lt;/b&gt;。&lt;br&gt;
 点击&lt;b&gt;下载&lt;/b&gt;，打开下载页面。</translation>
@@ -2181,12 +2615,12 @@
         <translation type="obsolete">查询面板</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="395"/>
+        <location filename="../mainwindow.ui" line="411"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="455"/>
+        <location filename="../mainwindow.ui" line="471"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
@@ -2195,17 +2629,17 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="519"/>
+        <location filename="../mainwindow.cc" line="548"/>
         <source>Loading...</source>
         <translation>加载中……</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1344"/>
+        <location filename="../mainwindow.cc" line="1455"/>
         <source>(untitled)</source>
         <translation>（未命名）</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="334"/>
+        <location filename="../mainwindow.ui" line="353"/>
         <source>&amp;Preferences...</source>
         <translation>首选项(&amp;P)...</translation>
     </message>
@@ -2215,27 +2649,27 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="46"/>
-        <location filename="../mainwindow.cc" line="695"/>
+        <location filename="../mainwindow.cc" line="735"/>
         <source>Welcome!</source>
         <translation>欢迎使用！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="163"/>
+        <location filename="../mainwindow.cc" line="196"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>朗读词条(Alt+S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="410"/>
+        <location filename="../mainwindow.ui" line="426"/>
         <source>Save Article</source>
         <translation>保存文章</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2677"/>
+        <location filename="../mainwindow.cc" line="2925"/>
         <source>Skip This Release</source>
         <translation>忽略此次升级</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="123"/>
+        <location filename="../mainwindow.cc" line="156"/>
         <source>Forward</source>
         <translation>前进</translation>
     </message>
@@ -2244,12 +2678,12 @@
         <translation type="obsolete">警告： %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2925"/>
+        <location filename="../mainwindow.cc" line="3173"/>
         <source>Print Article</source>
         <translation>打印文章</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2907"/>
+        <location filename="../mainwindow.cc" line="3155"/>
         <source>No printer is available. Please install one first.</source>
         <translation>找不到可用的打印机，请先安装一个打印机。</translation>
     </message>
@@ -2258,7 +2692,7 @@
         <translation type="obsolete">导航栏</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="104"/>
+        <location filename="../mainwindow.ui" line="115"/>
         <source>&amp;View</source>
         <translation>查看(&amp;V)</translation>
     </message>
@@ -2267,52 +2701,52 @@
         <translation type="obsolete">在词典栏中显示词典名称</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="115"/>
+        <location filename="../mainwindow.ui" line="126"/>
         <source>H&amp;istory</source>
         <translation>历史(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="463"/>
+        <location filename="../mainwindow.ui" line="479"/>
         <source>&amp;Clear</source>
         <translation>清除(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="108"/>
+        <location filename="../mainwindow.ui" line="119"/>
         <source>&amp;Zoom</source>
         <translation>缩放(&amp;Z)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="293"/>
+        <location filename="../mainwindow.cc" line="329"/>
         <source>Words Zoom In</source>
         <translation>单词列表 - 放大</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="297"/>
+        <location filename="../mainwindow.cc" line="333"/>
         <source>Words Zoom Out</source>
         <translation>单词列表 - 缩小</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="299"/>
+        <location filename="../mainwindow.cc" line="335"/>
         <source>Words Normal Size</source>
         <translation>单词列表 - 正常大小</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="355"/>
+        <location filename="../mainwindow.cc" line="381"/>
         <source>Close current tab</source>
         <translation>关闭当前标签页</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="365"/>
+        <location filename="../mainwindow.cc" line="391"/>
         <source>Close all tabs</source>
         <translation>关闭所有标签页</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="373"/>
+        <location filename="../mainwindow.cc" line="399"/>
         <source>Close all tabs except current</source>
         <translation>关闭其它标签页</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="344"/>
+        <location filename="../mainwindow.cc" line="370"/>
         <source>Opened tabs</source>
         <translation>已打开的标签页</translation>
     </message>
@@ -2325,17 +2759,17 @@
         <translation type="obsolete">词典...(&amp;D)   	F3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="529"/>
+        <location filename="../mainwindow.cc" line="558"/>
         <source>New Tab</source>
         <translation>新建标签页</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="478"/>
+        <location filename="../mainwindow.ui" line="494"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="489"/>
+        <location filename="../mainwindow.ui" line="505"/>
         <source>&amp;Configuration Folder</source>
         <translation>配置文件夹(&amp;C)</translation>
     </message>
@@ -2344,48 +2778,54 @@
         <translation type="obsolete">在工具栏上显示小图标</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="81"/>
+        <location filename="../mainwindow.cc" line="96"/>
         <source>&amp;Menubar</source>
         <translation>菜单栏(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="263"/>
+        <location filename="../mainwindow.cc" line="299"/>
         <source>Found in Dictionaries:</source>
         <translation>在以下词典中找到：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1286"/>
+        <location filename="../mainwindow.cc" line="871"/>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="1397"/>
         <source>Open Tabs List</source>
         <translation>打开标签页列表</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="1553"/>
+        <location filename="../mainwindow.cc" line="1669"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2807"/>
+        <location filename="../mainwindow.cc" line="3055"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>你选择了隐藏菜单栏，使用 %1 再次显示。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2808"/>
+        <location filename="../mainwindow.cc" line="3056"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="497"/>
-        <location filename="../mainwindow.cc" line="3263"/>
+        <location filename="../mainwindow.ui" line="513"/>
+        <location filename="../mainwindow.cc" line="3529"/>
         <source>&amp;Show</source>
         <translation>显示(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="508"/>
+        <location filename="../mainwindow.ui" line="524"/>
         <source>&amp;Export</source>
         <translation>导出(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3259"/>
+        <location filename="../mainwindow.cc" line="3525"/>
         <source>&amp;Hide</source>
         <translation>隐藏(&amp;H)</translation>
     </message>
@@ -2394,161 +2834,191 @@
         <translation type="obsolete">历史记录查看模式</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3285"/>
+        <location filename="../mainwindow.cc" line="3551"/>
         <source>Export history to file</source>
         <translation>导出历史记录到文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3287"/>
-        <location filename="../mainwindow.cc" line="3349"/>
+        <location filename="../mainwindow.cc" line="3553"/>
+        <location filename="../mainwindow.cc" line="3615"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>文本文件 (*.txt);;所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3326"/>
+        <location filename="../mainwindow.cc" line="3592"/>
         <source>History export complete</source>
         <translation>历史记录导出完成</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3329"/>
+        <location filename="../mainwindow.cc" line="3595"/>
         <source>Export error: </source>
         <translation>导出错误：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="500"/>
+        <location filename="../mainwindow.ui" line="516"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="516"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>&amp;Import</source>
         <translation>导入(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3347"/>
+        <location filename="../mainwindow.cc" line="3613"/>
         <source>Import history from file</source>
         <translation>导入历史文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3396"/>
+        <location filename="../mainwindow.cc" line="3662"/>
         <source>Import error: invalid data in file</source>
         <translation>导入失败：无效数据</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3400"/>
+        <location filename="../mainwindow.cc" line="3666"/>
         <source>History import complete</source>
         <translation>历史导入成功</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3403"/>
+        <location filename="../mainwindow.cc" line="3669"/>
         <source>Import error: </source>
         <translation>导入错误：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3591"/>
+        <location filename="../mainwindow.cc" line="3920"/>
         <source>Dictionary info</source>
         <translation>词典信息</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3593"/>
+        <location filename="../mainwindow.cc" line="3924"/>
+        <source>Dictionary headwords</source>
+        <translation>词典词条</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="3926"/>
         <source>Open dictionary folder</source>
         <translation>打开词典文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3599"/>
+        <location filename="../mainwindow.cc" line="3932"/>
         <source>Edit dictionary</source>
         <translation>编辑词典信息</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="../mainwindow.ui" line="150"/>
         <source>&amp;Search Pane</source>
         <translation>查询面板(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="258"/>
+        <location filename="../mainwindow.ui" line="277"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>查询结果导航面板(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="444"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Print Pre&amp;view</source>
         <translation>打印预览(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="452"/>
+        <location filename="../mainwindow.ui" line="468"/>
         <source>&amp;Rescan Files</source>
         <translation>重新扫描文件(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="491"/>
         <source>&amp;New Tab</source>
         <translation>新建标签页(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="527"/>
+        <location filename="../mainwindow.ui" line="543"/>
         <source>&amp;Always on Top</source>
         <translation>总在最前(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="530"/>
+        <location filename="../mainwindow.ui" line="546"/>
         <source>Always on Top</source>
         <translation>总在最前</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="533"/>
+        <location filename="../mainwindow.ui" line="549"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="542"/>
-        <location filename="../mainwindow.ui" line="545"/>
-        <location filename="../mainwindow.cc" line="217"/>
+        <location filename="../mainwindow.ui" line="558"/>
+        <location filename="../mainwindow.ui" line="561"/>
+        <location filename="../mainwindow.cc" line="253"/>
         <source>Menu Button</source>
         <translation>菜单按钮</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="79"/>
+        <location filename="../mainwindow.ui" line="566"/>
+        <source>Search in page</source>
+        <translation>页内搜索</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="569"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="577"/>
+        <source>Full-text search</source>
+        <translation>全文搜索</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="580"/>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="591"/>
+        <source>GoldenDict reference</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cc" line="94"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>在词典栏中显示词典名称(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="80"/>
+        <location filename="../mainwindow.cc" line="95"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>在工具栏上显示小图标(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="118"/>
+        <location filename="../mainwindow.cc" line="151"/>
         <source>&amp;Navigation</source>
         <translation>导航栏(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2994"/>
+        <location filename="../mainwindow.cc" line="3242"/>
         <source>Article, Complete (*.html)</source>
         <translation>文章, 完整 (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="2995"/>
+        <location filename="../mainwindow.cc" line="3243"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>文章, 仅 HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3050"/>
+        <location filename="../mainwindow.cc" line="3298"/>
         <source>Saving article...</source>
         <translation>文章保存中……</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="3099"/>
+        <location filename="../mainwindow.cc" line="3358"/>
         <source>The main window is set to be always on top.</source>
         <translation>主窗口已设置为总在最前。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="285"/>
+        <location filename="../mainwindow.ui" line="304"/>
         <source>&amp;History Pane</source>
         <translation>历史面板(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cc" line="763"/>
-        <location filename="../mainwindow.cc" line="2730"/>
+        <location filename="../mainwindow.cc" line="794"/>
+        <location filename="../mainwindow.cc" line="2978"/>
         <source>Accessibility API is not enabled</source>
         <translation>无障碍API未启用</translation>
     </message>
@@ -2556,12 +3026,12 @@
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../mdx.cc" line="552"/>
+        <location filename="../mdx.cc" line="636"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>词典文件被修改或已损坏</translation>
     </message>
     <message>
-        <location filename="../mdx.cc" line="563"/>
+        <location filename="../mdx.cc" line="647"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>从 %1 加载文章失败：%2</translation>
     </message>
@@ -2569,7 +3039,7 @@
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="310"/>
+        <location filename="../mediawiki.cc" line="324"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 解析失败：%1 于 %2, %3</translation>
     </message>
@@ -2577,7 +3047,7 @@
 <context>
     <name>MediaWiki::MediaWikiWordSearchRequest</name>
     <message>
-        <location filename="../mediawiki.cc" line="185"/>
+        <location filename="../mediawiki.cc" line="192"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 解析失败：%1 于 %2, %3</translation>
     </message>
@@ -2585,22 +3055,22 @@
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../sources.cc" line="417"/>
+        <location filename="../sources.cc" line="451"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="419"/>
+        <location filename="../sources.cc" line="453"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="415"/>
+        <location filename="../sources.cc" line="449"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="421"/>
+        <location filename="../sources.cc" line="455"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -2608,12 +3078,8 @@
 <context>
     <name>OrderAndProps</name>
     <message>
-        <location filename="../orderandprops.ui" line="41"/>
-        <location filename="../orderandprops.ui" line="51"/>
-        <location filename="../orderandprops.ui" line="101"/>
-        <location filename="../orderandprops.ui" line="111"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <location filename="../orderandprops.ui" line="14"/>
@@ -2621,80 +3087,90 @@
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="139"/>
+        <location filename="../orderandprops.ui" line="53"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>未启用（已禁用）的词典：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="161"/>
+        <location filename="../orderandprops.ui" line="75"/>
         <source>Name:</source>
         <translation>名称：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="188"/>
+        <location filename="../orderandprops.ui" line="105"/>
         <source>Total articles:</source>
         <translation>文章总数：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="212"/>
+        <location filename="../orderandprops.ui" line="129"/>
         <source>Translates from:</source>
         <translation>词条语言：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="219"/>
+        <location filename="../orderandprops.ui" line="136"/>
         <source>Translates to:</source>
         <translation>释义语言：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="195"/>
+        <location filename="../orderandprops.ui" line="112"/>
         <source>Total words:</source>
         <translation>词条总数：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="408"/>
+        <location filename="../orderandprops.ui" line="325"/>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
         <translation>可以通过拖拽改变项目的排序。将词典放入未启用的群组以禁用。</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="76"/>
+        <location filename="../orderandprops.ui" line="37"/>
         <source>Dictionary order:</source>
         <translation>词典排序：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="328"/>
+        <location filename="../orderandprops.ui" line="245"/>
         <source>Files comprising this dictionary:</source>
         <translation>此词典包含的文件：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="153"/>
+        <location filename="../orderandprops.ui" line="67"/>
         <source>Dictionary information</source>
         <translation>词典信息</translation>
     </message>
     <message>
-        <location filename="../orderandprops.ui" line="248"/>
+        <location filename="../orderandprops.ui" line="165"/>
         <source>Description:</source>
         <translation>描述：</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="248"/>
+        <location filename="../orderandprops.cc" line="253"/>
         <source>Sort by name</source>
         <translation>按名称排序</translation>
     </message>
     <message>
-        <location filename="../orderandprops.cc" line="250"/>
+        <location filename="../orderandprops.cc" line="255"/>
         <source>Sort by languages</source>
         <translation>按语言排序</translation>
     </message>
+    <message>
+        <location filename="../orderandprops.cc" line="266"/>
+        <source>Dictionary headwords</source>
+        <translation>词典词条</translation>
+    </message>
+    <message>
+        <location filename="../orderandprops.cc" line="290"/>
+        <source>Dictionaries active: %1, inactive: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../sources.cc" line="913"/>
+        <location filename="../sources.cc" line="1122"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="915"/>
+        <location filename="../sources.cc" line="1124"/>
         <source>Recursive</source>
         <translation>递归搜索</translation>
     </message>
@@ -2702,7 +3178,7 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../preferences.ui" line="471"/>
+        <location filename="../preferences.ui" line="503"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
@@ -2712,22 +3188,22 @@
         <translation>启动至系统托盘</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="528"/>
+        <location filename="../preferences.ui" line="560"/>
         <source>Left Shift only</source>
         <translation>仅限左 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="481"/>
+        <location filename="../preferences.ui" line="513"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="612"/>
+        <location filename="../preferences.ui" line="653"/>
         <source>secs</source>
         <translation>秒</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="541"/>
+        <location filename="../preferences.ui" line="573"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
@@ -2737,32 +3213,32 @@
         <translation>启用系统托盘图标</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="957"/>
+        <location filename="../preferences.ui" line="1018"/>
         <source>Host:</source>
         <translation>主机：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="967"/>
+        <location filename="../preferences.ui" line="1028"/>
         <source>Port:</source>
         <translation>端口：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="501"/>
+        <location filename="../preferences.ui" line="533"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="947"/>
+        <location filename="../preferences.ui" line="1008"/>
         <source>Type:</source>
         <translation>类型：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="988"/>
+        <location filename="../preferences.ui" line="1049"/>
         <source>User:</source>
         <translation>用户名：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="357"/>
+        <location filename="../preferences.ui" line="380"/>
         <source>&amp;Scan Popup</source>
         <translation>屏幕取词(&amp;S)</translation>
     </message>
@@ -2775,27 +3251,27 @@
 启用此选项将会在打开新标签页时不自动选定。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="933"/>
+        <location filename="../preferences.ui" line="974"/>
         <source>Use proxy server</source>
         <translation>使用代理服务器</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="715"/>
+        <location filename="../preferences.ui" line="756"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>使用下列热键翻译剪贴板中的单词：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="538"/>
+        <location filename="../preferences.ui" line="570"/>
         <source>Windows key or Meta key</source>
         <translation>Windows 键或 Meta 键</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="409"/>
+        <location filename="../preferences.ui" line="432"/>
         <source>Only show popup when all selected keys are kept pressed:</source>
         <translation>仅在按住下列特定的按键时屏幕取词才会启动：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="835"/>
+        <location filename="../preferences.ui" line="876"/>
         <source>Auto-pronounce words in main window</source>
         <translation>自动朗读主窗口中的词条</translation>
     </message>
@@ -2805,7 +3281,7 @@
         <translation>随系统启动</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="488"/>
+        <location filename="../preferences.ui" line="520"/>
         <source>Left Alt only</source>
         <translation>仅限左 Alt</translation>
     </message>
@@ -2815,7 +3291,7 @@
         <translation>标签页浏览</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="458"/>
+        <location filename="../preferences.ui" line="490"/>
         <source>Right Shift only</source>
         <translation>仅限右 Shift</translation>
     </message>
@@ -2827,12 +3303,12 @@
 而不是退出程序。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="810"/>
+        <location filename="../preferences.ui" line="851"/>
         <source>&amp;Audio</source>
         <translation>音频(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="929"/>
+        <location filename="../preferences.ui" line="970"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>如果你希望通过代理服务器执行程序的网络查
@@ -2844,7 +3320,7 @@
         <translation>界面语言：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="448"/>
+        <location filename="../preferences.ui" line="480"/>
         <source>Left Ctrl only</source>
         <translation>仅限左 Ctrl</translation>
     </message>
@@ -2854,32 +3330,32 @@
         <translation>在后台打开新标签页</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="910"/>
+        <location filename="../preferences.ui" line="951"/>
         <source>&amp;Network</source>
         <translation>网络(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="518"/>
+        <location filename="../preferences.ui" line="550"/>
         <source>Right Ctrl only</source>
         <translation>仅限右 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="82"/>
+        <location filename="../preferences.cc" line="141"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="461"/>
+        <location filename="../preferences.ui" line="493"/>
         <source>Right Shift</source>
         <translation>右 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="531"/>
+        <location filename="../preferences.ui" line="563"/>
         <source>Left Shift</source>
         <translation>左 Shift</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="405"/>
+        <location filename="../preferences.ui" line="428"/>
         <source>With this enabled, the popup would only show up if all chosen keys are
 in the pressed state when the word selection changes.</source>
         <translation>启用后，屏幕取词窗口只有在按住特定按键时才会弹出。</translation>
@@ -2890,12 +3366,12 @@
         <translation>显示风格：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="842"/>
+        <location filename="../preferences.ui" line="883"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>自动朗读屏幕取词弹出窗口中的词条</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="382"/>
+        <location filename="../preferences.ui" line="405"/>
         <source>Enable scan popup functionality</source>
         <translation>启用屏幕取词功能</translation>
     </message>
@@ -2905,17 +3381,17 @@
         <translation>在当前页之后打开新标签页</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="364"/>
+        <location filename="../preferences.cc" line="553"/>
         <source>Restart the program to apply the language change.</source>
         <translation>变更界面语言需要重新启动程序才能生效。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="468"/>
+        <location filename="../preferences.ui" line="500"/>
         <source>Alt key</source>
         <translation>Alt 键</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="376"/>
+        <location filename="../preferences.ui" line="399"/>
         <source>When enabled, a translation popup window would be shown each time
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
@@ -2926,7 +3402,7 @@
 托盘菜单中选择是否激活屏幕取词功能。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1091"/>
+        <location filename="../preferences.ui" line="1155"/>
         <source>Check for new program releases periodically</source>
         <translation>定期检查可用版本</translation>
     </message>
@@ -2944,7 +3420,7 @@
         <translation>关闭至系统托盘</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="42"/>
+        <location filename="../preferences.cc" line="58"/>
         <source>System default</source>
         <translation>系统默认</translation>
     </message>
@@ -2955,7 +3431,7 @@
         <translation>启用此选项，将会启用系统托盘图标。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1084"/>
+        <location filename="../preferences.ui" line="1148"/>
         <source>When this is enabled, the program periodically
 checks if a new, updated version of GoldenDict
 is available for download. If it is so, the program
@@ -2971,12 +3447,13 @@
         <translation>开机自动启动</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="998"/>
+        <location filename="../preferences.ui" line="1059"/>
         <source>Password:</source>
         <translation>密码：</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="80"/>
+        <location filename="../preferences.cc" line="98"/>
+        <location filename="../preferences.cc" line="139"/>
         <source>Default</source>
         <translation>默认</translation>
     </message>
@@ -2986,7 +3463,7 @@
         <translation>界面(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="588"/>
+        <location filename="../preferences.ui" line="629"/>
         <source>To avoid false positives, the keys are only monitored
 after the selection&apos;s done for a limited amount of
 seconds, which is specified here.</source>
@@ -2994,27 +3471,27 @@
 被监视。热键监视的秒数可以在这里设置。</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="363"/>
+        <location filename="../preferences.cc" line="552"/>
         <source>Changing Language</source>
         <translation>变更界面语言</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="478"/>
+        <location filename="../preferences.ui" line="510"/>
         <source>Ctrl key</source>
         <translation>Ctr l键</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="684"/>
+        <location filename="../preferences.ui" line="725"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>使用下列热键显示或隐藏主窗口：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="491"/>
+        <location filename="../preferences.ui" line="523"/>
         <source>Left Alt</source>
         <translation>左 Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="508"/>
+        <location filename="../preferences.ui" line="540"/>
         <source>Right Alt only</source>
         <translation>仅限右 Alt</translation>
     </message>
@@ -3024,37 +3501,37 @@
         <translation>首选项</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="581"/>
+        <location filename="../preferences.ui" line="622"/>
         <source>Keys may also be pressed afterwards, within</source>
         <translation>按键取词容许的延迟时间：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="451"/>
+        <location filename="../preferences.ui" line="483"/>
         <source>Left Ctrl</source>
         <translation>左 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="511"/>
+        <location filename="../preferences.ui" line="543"/>
         <source>Right Alt</source>
         <translation>右 Alt</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="762"/>
+        <location filename="../preferences.ui" line="803"/>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
         <translation>热键均为全局键，只要 GoldenDict 在后台运行，热键就可以在任何程序中使用。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="521"/>
+        <location filename="../preferences.ui" line="553"/>
         <source>Right Ctrl</source>
         <translation>右 Ctrl</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="665"/>
+        <location filename="../preferences.ui" line="706"/>
         <source>Hotkeys</source>
         <translation>热键</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="398"/>
+        <location filename="../preferences.ui" line="421"/>
         <source>Start with scan popup turned on</source>
         <translation>启动程序时同时启动屏幕取词</translation>
     </message>
@@ -3065,7 +3542,7 @@
         <translation>启用此选项，程序启动时将直接最小化至系统托盘。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="498"/>
+        <location filename="../preferences.ui" line="530"/>
         <source>Shift key</source>
         <translation>Shift 键</translation>
     </message>
@@ -3075,13 +3552,13 @@
         <translation>开机自动启动 GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="394"/>
+        <location filename="../preferences.ui" line="417"/>
         <source>Chooses whether the scan popup mode is on by default or not. If checked,
 the program would always start with the scan popup active.</source>
         <translation>选择是否默认启用屏幕取词模式。如果选中，程序启动时将会自动激活屏幕取词功能。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="575"/>
+        <location filename="../preferences.ui" line="616"/>
         <source>Normally, in order to activate a popup you have to
 maintain the chosen keys pressed while you select
 a word. With this enabled, the chosen keys may also
@@ -3091,7 +3568,7 @@
 的一小段时间内按下键即可。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="772"/>
+        <location filename="../preferences.ui" line="813"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3104,7 +3581,7 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:2em;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;注意： 你正在运行的 X.Org XServer 版本 RECORD 扩展功能不能正常工作。GoldenDict 中的热键可能因此而失效。问题的解决依赖于 xserver 自身的恢复。请参照如下链接： &lt;/span&gt;&lt;a href=&quot;https://bugs.freedesktop.org/show_bug.cgi?id=20500&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug 记录&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt; 并留下评论。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1033"/>
+        <location filename="../preferences.ui" line="1097"/>
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
@@ -3113,17 +3590,17 @@
 用此选项。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1038"/>
+        <location filename="../preferences.ui" line="1102"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>禁止载入来自其它站点的内容（封杀广告）</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="829"/>
+        <location filename="../preferences.ui" line="870"/>
         <source>Pronunciation</source>
         <translation>朗读</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="852"/>
+        <location filename="../preferences.ui" line="893"/>
         <source>Playback</source>
         <translation>播放</translation>
     </message>
@@ -3132,7 +3609,7 @@
         <translation type="obsolete">通过 Phonon 播放</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="873"/>
+        <location filename="../preferences.ui" line="914"/>
         <source>Use external program:</source>
         <translation>使用外部程序播放：</translation>
     </message>
@@ -3160,7 +3637,7 @@
         <translation type="obsolete">通过 Phonon 框架播放音频。有时不太稳定，但支持大多数音频文件格式。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="870"/>
+        <location filename="../preferences.ui" line="911"/>
         <source>Use any external program to play audio files</source>
         <translation>使用外部程序播放音频文件</translation>
     </message>
@@ -3176,7 +3653,7 @@
         <translation>ESC 键隐藏主窗口</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1045"/>
+        <location filename="../preferences.ui" line="1109"/>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
@@ -3184,7 +3661,7 @@
 安装相应插件才能使此选项正常工作。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1050"/>
+        <location filename="../preferences.ui" line="1114"/>
         <source>Enable web plugins</source>
         <translation>启用 web 插件</translation>
     </message>
@@ -3199,58 +3676,98 @@
         <translation>隐藏单标签页</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="311"/>
+        <location filename="../preferences.ui" line="288"/>
+        <source>Help language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="334"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>避免右键菜单出现过多词典条目。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="314"/>
+        <location filename="../preferences.ui" line="337"/>
         <source>Context menu dictionaries limit:</source>
         <translation>右键菜单词典数目限制：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="634"/>
+        <location filename="../preferences.ui" line="675"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>将翻译词条发送至主窗口，而非在取词窗口中显示</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="637"/>
+        <location filename="../preferences.ui" line="678"/>
         <source>Send translated word to main window</source>
         <translation>发送翻译词条到主窗口</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="858"/>
+        <location filename="../preferences.ui" line="899"/>
         <source>Play audio files via FFmpeg(libav) and libao</source>
         <translation>使用 FFmpeg(libav) 及 libao 播放音频文件 </translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="861"/>
+        <location filename="../preferences.ui" line="902"/>
         <source>Use internal player</source>
         <translation>使用内置播放器</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1057"/>
+        <location filename="../preferences.ui" line="986"/>
+        <source>System proxy</source>
+        <translation>系统代理</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="993"/>
+        <source>Custom proxy</source>
+        <translation>自定义代理</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1000"/>
+        <source>Custom settings</source>
+        <translation>自定义设置</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1121"/>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
         <translation>部分网站屏蔽了使用 GoldenDict 浏览器标识（UA）的请求，启用此选项以绕过该问题。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1061"/>
+        <location filename="../preferences.ui" line="1125"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>不使用 GoldenDict 浏览器标识（UA）</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1112"/>
+        <location filename="../preferences.ui" line="1180"/>
+        <source>Full-text search</source>
+        <translation>全文搜索</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1199"/>
+        <source>Allow full-text search for:</source>
+        <translation>允许对以下格式词典进行全文搜索：</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1283"/>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>不要在词条数多于</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1300"/>
+        <source>articles (0 - unlimited)</source>
+        <translation>个 (0 - 无限制) 的词典中进行搜索</translation>
+    </message>
+    <message>
+        <location filename="../preferences.ui" line="1346"/>
         <source>Ad&amp;vanced</source>
         <translation>高级(&amp;v)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1118"/>
+        <location filename="../preferences.ui" line="1352"/>
         <source>ScanPopup extra technologies</source>
         <translation>附加取词技术</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1124"/>
+        <location filename="../preferences.ui" line="1358"/>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
@@ -3260,12 +3777,12 @@
 如果你不使用此类程序，则不需要启用此选项。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1130"/>
+        <location filename="../preferences.ui" line="1364"/>
         <source>Use &amp;IAccessibleEx</source>
         <translation>使用 &amp;IAccessibleEx</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1137"/>
+        <location filename="../preferences.ui" line="1371"/>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3274,12 +3791,12 @@
 如果你不使用此类程序，则不需要启用此选项。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1142"/>
+        <location filename="../preferences.ui" line="1376"/>
         <source>Use &amp;UIAutomation</source>
         <translation>使用 &amp;UIAutomation</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1149"/>
+        <location filename="../preferences.ui" line="1383"/>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
@@ -3288,32 +3805,32 @@
 如果你不使用此类程序，则不需要启用此选项。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1154"/>
+        <location filename="../preferences.ui" line="1388"/>
         <source>Use &amp;GoldenDict message</source>
         <translation>使用 &amp;GoldenDict message</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1282"/>
+        <location filename="../preferences.ui" line="1516"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>开启此选项以自动展开文章的可选部分</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1285"/>
+        <location filename="../preferences.ui" line="1519"/>
         <source>Expand optional &amp;parts</source>
         <translation>展开可选部分(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1294"/>
+        <location filename="../preferences.ui" line="1528"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>开启此选项以自动收起过长的文章</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1297"/>
+        <location filename="../preferences.ui" line="1531"/>
         <source>Collapse articles more than</source>
         <translation>收起大于</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1304"/>
+        <location filename="../preferences.ui" line="1538"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>大于此大小的文章将被收起</translation>
     </message>
@@ -3322,7 +3839,7 @@
         <translation type="obsolete">大于此大小的文章将被收起</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1320"/>
+        <location filename="../preferences.ui" line="1554"/>
         <source>symbols</source>
         <translation>字符的文章</translation>
     </message>
@@ -3332,27 +3849,27 @@
         <translation>用 Ctrl-tab 浏览标签页时，以“最近使用”为序</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="83"/>
+        <location filename="../preferences.cc" line="142"/>
         <source>Babylon</source>
         <translation>Babylon</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1164"/>
+        <location filename="../preferences.ui" line="1398"/>
         <source>History</source>
         <translation>历史</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1170"/>
+        <location filename="../preferences.ui" line="1404"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>开启此选项已保存查询历史</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1173"/>
+        <location filename="../preferences.ui" line="1407"/>
         <source>Store &amp;history</source>
         <translation>保存历史(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1276"/>
+        <location filename="../preferences.ui" line="1510"/>
         <source>Articles</source>
         <translation>文章</translation>
     </message>
@@ -3381,42 +3898,42 @@
         <translation>附加样式：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1188"/>
+        <location filename="../preferences.ui" line="1422"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>指定历史最大条数。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1191"/>
+        <location filename="../preferences.ui" line="1425"/>
         <source>Maximum history size:</source>
         <translation>最大历史条数：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1228"/>
+        <location filename="../preferences.ui" line="1462"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>历史保存周期。若为 0 则只在程序退出时保存。</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1234"/>
+        <location filename="../preferences.ui" line="1468"/>
         <source>Save every</source>
         <translation>保存周期：</translation>
     </message>
     <message>
-        <location filename="../preferences.ui" line="1251"/>
+        <location filename="../preferences.ui" line="1485"/>
         <source>minutes</source>
         <translation>分钟</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="81"/>
+        <location filename="../preferences.cc" line="140"/>
         <source>Modern</source>
         <translation>现代</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="84"/>
+        <location filename="../preferences.cc" line="143"/>
         <source>Lingoes</source>
         <translation>灵格斯</translation>
     </message>
     <message>
-        <location filename="../preferences.cc" line="85"/>
+        <location filename="../preferences.cc" line="144"/>
         <source>Lingoes-Blue</source>
         <translation>灵格斯-蓝色调</translation>
     </message>
@@ -3424,27 +3941,27 @@
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../sources.cc" line="821"/>
+        <location filename="../sources.cc" line="1030"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="823"/>
+        <location filename="../sources.cc" line="1032"/>
         <source>Plain Text</source>
         <translation>纯文本</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="825"/>
+        <location filename="../sources.cc" line="1034"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="827"/>
+        <location filename="../sources.cc" line="1036"/>
         <source>Prefix Match</source>
         <translation>匹配前缀</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="829"/>
+        <location filename="../sources.cc" line="1038"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -3470,27 +3987,27 @@
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../sources.cc" line="729"/>
+        <location filename="../sources.cc" line="938"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="731"/>
+        <location filename="../sources.cc" line="940"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="733"/>
+        <location filename="../sources.cc" line="942"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="735"/>
+        <location filename="../sources.cc" line="944"/>
         <source>Command Line</source>
         <translation>命令行</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="737"/>
+        <location filename="../sources.cc" line="946"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -3498,12 +4015,14 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../aard.cc" line="396"/>
+        <location filename="../aard.cc" line="420"/>
+        <location filename="../dsl.cc" line="1654"/>
         <source>Article loading error</source>
         <translation>文章加载错误</translation>
     </message>
     <message>
-        <location filename="../aard.cc" line="478"/>
+        <location filename="../aard.cc" line="512"/>
+        <location filename="../slob.cc" line="726"/>
         <source>Article decoding error</source>
         <translation>文章解码错误</translation>
     </message>
@@ -3614,18 +4133,18 @@
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2637"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>ERROR: %1</source>
         <translation>错误： %1</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2193"/>
+        <location filename="../articleview.cc" line="2637"/>
         <source>Resource saving error: </source>
         <translation>资源保存失败：</translation>
     </message>
     <message>
-        <location filename="../articleview.cc" line="2200"/>
+        <location filename="../articleview.cc" line="2644"/>
         <source>The referenced resource failed to download.</source>
         <translation>所引用的资源下载失败。</translation>
     </message>
@@ -3633,12 +4152,12 @@
 <context>
     <name>Romaji</name>
     <message>
-        <location filename="../romaji.cc" line="116"/>
+        <location filename="../romaji.cc" line="117"/>
         <source>Hepburn Romaji for Katakana</source>
         <translation>黑本式罗马字（片假名）</translation>
     </message>
     <message>
-        <location filename="../romaji.cc" line="107"/>
+        <location filename="../romaji.cc" line="108"/>
         <source>Hepburn Romaji for Hiragana</source>
         <translation>黑本式罗马字（平假名）</translation>
     </message>
@@ -3654,11 +4173,11 @@
 <context>
     <name>ScanPopup</name>
     <message>
-        <location filename="../scanpopup.ui" line="110"/>
-        <location filename="../scanpopup.ui" line="124"/>
-        <location filename="../scanpopup.ui" line="138"/>
-        <location filename="../scanpopup.ui" line="188"/>
-        <location filename="../scanpopup.ui" line="212"/>
+        <location filename="../scanpopup.ui" line="116"/>
+        <location filename="../scanpopup.ui" line="130"/>
+        <location filename="../scanpopup.ui" line="144"/>
+        <location filename="../scanpopup.ui" line="194"/>
+        <location filename="../scanpopup.ui" line="218"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3671,7 +4190,7 @@
         <translation type="obsolete">Alt+M</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="145"/>
+        <location filename="../scanpopup.ui" line="151"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
@@ -3685,38 +4204,38 @@
         <translation type="obsolete">列出符合条件的词条(Alt+M)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="135"/>
+        <location filename="../scanpopup.ui" line="141"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>朗读词条(Alt+S)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="185"/>
+        <location filename="../scanpopup.ui" line="191"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>显示或隐藏词典栏</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="208"/>
+        <location filename="../scanpopup.ui" line="214"/>
         <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
         <translation>使用此按钮可以固定窗口，以便它能停留在屏幕上进行改变大小等相关窗口管理操作。</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="155"/>
+        <location filename="../scanpopup.ui" line="161"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>将词条发送到主窗口 (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="165"/>
+        <location filename="../scanpopup.ui" line="171"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="107"/>
+        <location filename="../scanpopup.ui" line="113"/>
         <source>Back</source>
         <translation>回退</translation>
     </message>
     <message>
-        <location filename="../scanpopup.ui" line="121"/>
+        <location filename="../scanpopup.ui" line="127"/>
         <source>Forward</source>
         <translation>前进</translation>
     </message>
@@ -3725,8 +4244,8 @@
         <translation type="obsolete">GoldenDict</translation>
     </message>
     <message>
-        <location filename="../scanpopup.cc" line="480"/>
-        <location filename="../scanpopup.cc" line="825"/>
+        <location filename="../scanpopup.cc" line="501"/>
+        <location filename="../scanpopup.cc" line="850"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -3734,17 +4253,17 @@
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../sources.cc" line="1021"/>
+        <location filename="../sources.cc" line="1230"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1019"/>
+        <location filename="../sources.cc" line="1228"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="1023"/>
+        <location filename="../sources.cc" line="1232"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -3757,17 +4276,17 @@
         <translation>文件</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="746"/>
+        <location filename="../sources.ui" line="802"/>
         <source>Hiragana</source>
         <translation>平假名</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="686"/>
+        <location filename="../sources.ui" line="742"/>
         <source>Systems:</source>
         <translation>方案：</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="713"/>
+        <location filename="../sources.ui" line="769"/>
         <source>Nihon-shiki</source>
         <translation>日本式</translation>
     </message>
@@ -3776,8 +4295,9 @@
         <translation type="obsolete">作为替代选项，使用 %GD1251% 代替 CP1251，%GDISO1% 代替 ISO 8859-1.</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="235"/>
-        <location filename="../sources.cc" line="259"/>
+        <location filename="../sources.cc" line="245"/>
+        <location filename="../sources.cc" line="269"/>
+        <location filename="../sources.cc" line="293"/>
         <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>确定要将&lt;b&gt;%1&lt;/b&gt;网站从列表中移除吗？</translation>
     </message>
@@ -3787,7 +4307,7 @@
         <translation>维基百科</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="753"/>
+        <location filename="../sources.ui" line="809"/>
         <source>Katakana Japanese syllabary</source>
         <translation>日语的片假名</translation>
     </message>
@@ -3797,18 +4317,18 @@
         <translation>如果要批量添加音频文件，请把路径添加在这里：</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="168"/>
-        <location filename="../sources.cc" line="195"/>
+        <location filename="../sources.cc" line="178"/>
+        <location filename="../sources.cc" line="205"/>
         <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>确定要将&lt;b&gt;%1&lt;/b&gt;目录从列表中移除吗？</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="674"/>
+        <location filename="../sources.ui" line="730"/>
         <source>Japanese Romaji</source>
         <translation>日文罗马字</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="723"/>
+        <location filename="../sources.ui" line="779"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -3829,23 +4349,23 @@
         <translation>音频文件目录</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="693"/>
+        <location filename="../sources.ui" line="749"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>以英文语音学为基础建立的，最常用的日文转写方案</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="743"/>
+        <location filename="../sources.ui" line="799"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>日语的平假名</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="578"/>
+        <location filename="../sources.ui" line="634"/>
         <source>Transliteration</source>
         <translation>转写</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="707"/>
+        <location filename="../sources.ui" line="763"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -3856,7 +4376,7 @@
 GoldenDict 尚不支持此方案。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="599"/>
+        <location filename="../sources.ui" line="655"/>
         <source>Russian transliteration</source>
         <translation>俄文转写</translation>
     </message>
@@ -3871,7 +4391,7 @@
         <translation>变更...(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="756"/>
+        <location filename="../sources.ui" line="812"/>
         <source>Katakana</source>
         <translation>片假名</translation>
     </message>
@@ -3886,7 +4406,7 @@
         <translation>重新扫描(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="634"/>
+        <location filename="../sources.ui" line="690"/>
         <source>German transliteration</source>
         <translation>德文转写</translation>
     </message>
@@ -3900,14 +4420,15 @@
         <location filename="../sources.ui" line="120"/>
         <location filename="../sources.ui" line="244"/>
         <location filename="../sources.ui" line="303"/>
-        <location filename="../sources.ui" line="370"/>
+        <location filename="../sources.ui" line="367"/>
+        <location filename="../sources.ui" line="426"/>
         <source>&amp;Add...</source>
         <translation>添加(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="153"/>
-        <location filename="../sources.cc" line="180"/>
-        <location filename="../sources.cc" line="207"/>
+        <location filename="../sources.cc" line="163"/>
+        <location filename="../sources.cc" line="190"/>
+        <location filename="../sources.cc" line="217"/>
         <source>Choose a directory</source>
         <translation>选择目录</translation>
     </message>
@@ -3916,7 +4437,8 @@
         <location filename="../sources.ui" line="127"/>
         <location filename="../sources.ui" line="251"/>
         <location filename="../sources.ui" line="310"/>
-        <location filename="../sources.ui" line="377"/>
+        <location filename="../sources.ui" line="374"/>
+        <location filename="../sources.ui" line="433"/>
         <source>&amp;Remove</source>
         <translation>移除(&amp;R)</translation>
     </message>
@@ -3931,16 +4453,17 @@
         <translation>词典文件所在目录：</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="167"/>
-        <location filename="../sources.cc" line="194"/>
-        <location filename="../sources.cc" line="234"/>
-        <location filename="../sources.cc" line="258"/>
-        <location filename="../sources.cc" line="282"/>
+        <location filename="../sources.cc" line="177"/>
+        <location filename="../sources.cc" line="204"/>
+        <location filename="../sources.cc" line="244"/>
+        <location filename="../sources.cc" line="268"/>
+        <location filename="../sources.cc" line="292"/>
+        <location filename="../sources.cc" line="316"/>
         <source>Confirm removal</source>
         <translation>确认移除</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="736"/>
+        <location filename="../sources.ui" line="792"/>
         <source>Syllabaries:</source>
         <translation>音节：</translation>
     </message>
@@ -3950,7 +4473,7 @@
         <translation>可用的构词法规则库：</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="671"/>
+        <location filename="../sources.ui" line="727"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>启用日文罗马字转写</translation>
     </message>
@@ -3968,42 +4491,52 @@
 最下面。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="697"/>
+        <location filename="../sources.ui" line="753"/>
         <source>Hepburn</source>
         <translation>黑本式</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="729"/>
+        <location filename="../sources.ui" line="785"/>
         <source>Kunrei-shiki</source>
         <translation>训令式</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="406"/>
+        <location filename="../sources.ui" line="462"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
+        <location filename="../sources.ui" line="347"/>
+        <source>DICT servers</source>
+        <translation>词典服务器</translation>
+    </message>
+    <message>
         <location filename="../sources.ui" line="353"/>
+        <source>DICT servers:</source>
+        <translation>词典服务器：</translation>
+    </message>
+    <message>
+        <location filename="../sources.ui" line="409"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
         <translation>任意外部程序。字符串 %GDWORD% 会被所查词条替换。若 %GDWORD% 不存在，该词条会写入标准输入。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="418"/>
+        <location filename="../sources.ui" line="474"/>
         <source>Live pronunciations from &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. The site allows people to record and share word pronunciations. You can listen to them from GoldenDict.</source>
         <translation>从 &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt; 获取即时发音。这个网站使得人们可以记录并分享单词发音。你可以从 GoldenDict 中听这些发音。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="431"/>
+        <location filename="../sources.ui" line="487"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>启用来自 Forvo 的发音功能</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="461"/>
+        <location filename="../sources.ui" line="517"/>
         <source>API Key:</source>
         <translation>API 密钥：</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="468"/>
+        <location filename="../sources.ui" line="524"/>
         <source>Use of Forvo currently requires an API key. Leave this field
 blank to use the default key, which may become unavailable
 in the future, or register on the site to get your own key.</source>
@@ -4029,32 +4562,32 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:2em;&quot;&gt;从&lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;这里&lt;/span&gt;&lt;/a&gt;获取属于你的 key, 或者保持空白以使用默认 key.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="506"/>
+        <location filename="../sources.ui" line="562"/>
         <source>Language codes (comma-separated):</source>
         <translation>语言代码（用逗号分隔）：</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="513"/>
+        <location filename="../sources.ui" line="569"/>
         <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
         <translation>你所需要的语言代码列表。例如：&quot;en, ru&quot;.</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="536"/>
+        <location filename="../sources.ui" line="592"/>
         <source>Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</source>
         <translation>语言代码的完整列表可以从&lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;这里&lt;/a&gt;获取。</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="610"/>
+        <location filename="../sources.ui" line="666"/>
         <source>Greek transliteration</source>
         <translation>希腊文转写</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="116"/>
+        <location filename="../sources.cc" line="126"/>
         <source>(not available in portable version)</source>
         <translation>（便携版中不可用）</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="347"/>
+        <location filename="../sources.ui" line="403"/>
         <source>Programs</source>
         <translation>程序</translation>
     </message>
@@ -4063,17 +4596,17 @@
         <translation type="obsolete">任意外部程序均可。字符串 %GDWORD% 会被所查词条替换，词条会写入标准输入。</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="283"/>
+        <location filename="../sources.cc" line="317"/>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
         <translation>从列表中删除程序 &lt;b&gt;%1&lt;/b&gt;？</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="645"/>
+        <location filename="../sources.ui" line="701"/>
         <source>Belarusian transliteration</source>
         <translation>白俄罗斯语转写</translation>
     </message>
     <message>
-        <location filename="../sources.ui" line="493"/>
+        <location filename="../sources.ui" line="549"/>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
         <translation>从&lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;这里&lt;/a&gt;获取自己的API Key，或留空以使用默认API Key。</translation>
     </message>
@@ -4085,7 +4618,7 @@
 %GDBIG5% 对应 Big-5, %GDBIG5HKSCS% 对应 Big5-HKSCS, %GDGBK% 对应 GBK 及 GB18030, %GDSHIFTJIS% 对应 Shift-JIS.</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="100"/>
+        <location filename="../sources.cc" line="110"/>
         <source>Text to Speech</source>
         <translation>语音合成</translation>
     </message>
@@ -4215,22 +4748,22 @@
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../sources.cc" line="574"/>
+        <location filename="../sources.cc" line="608"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="576"/>
+        <location filename="../sources.cc" line="610"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="572"/>
+        <location filename="../sources.cc" line="606"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../sources.cc" line="578"/>
+        <location filename="../sources.cc" line="612"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -4238,7 +4771,7 @@
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../wordfinder.cc" line="170"/>
+        <location filename="../wordfinder.cc" line="203"/>
         <source>Failed to query some dictionaries.</source>
         <translation>在某些词典中进行查询时失败。</translation>
     </message>
diff -Nru goldendict-1.5.0~git20131003/locale/zh_TW.ts goldendict-1.5.0~git20150923/locale/zh_TW.ts
--- goldendict-1.5.0~git20131003/locale/zh_TW.ts	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/locale/zh_TW.ts	2015-09-23 08:26:24.000000000 +0000
@@ -9,7 +9,7 @@
     </message>
     <message>
         <source>GoldenDict dictionary lookup program, version </source>
-        <translation>GoldenDict 電子詞典程式，版本 </translation>
+        <translation>GoldenDict 查字典程式，版本 </translation>
     </message>
     <message>
         <source>Licensed under GNU GPLv3 or later</source>
@@ -25,22 +25,22 @@
     </message>
     <message>
         <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
-        <translation type="unfinished">(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
+        <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
     <message>
         <source>Based on Qt %1 (%2, %3 bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>基於 QT %1(%2, %3 bit)</translation>
     </message>
 </context>
 <context>
     <name>ArticleMaker</name>
     <message>
         <source>Then just stop the cursor over the word you want to look up in another application, and a window would pop up which would describe it to you.</source>
-        <translation>然後只要將滑鼠指標停留在你想要進行抓詞查詢的單字上，程式就會在蹦現式視窗中顯示釋義。</translation>
+        <translation>然後只要將滑鼠游標停留在你想要進行查詢的單字上，程式就會在彈出式視窗中顯示釋義。</translation>
     </message>
     <message>
         <source>&lt;h3 align=&quot;center&quot;&gt;Working with the popup&lt;/h3&gt;To look up words from other active applications, you would need to first activate the &lt;i&gt;&quot;Scan popup functionality&quot;&lt;/i&gt; in &lt;b&gt;Preferences&lt;/b&gt;, and then enable it at any time either by triggering the &apos;Popup&apos; icon above, or by clicking the tray icon down below with your right mouse button and choosing so in the menu you&apos;ve popped. </source>
-        <translation>&lt;h3 align=&quot;center&quot;&gt;使用螢幕取詞功能&lt;/h3&gt;&lt;p style=&quot;text-indent:2em&quot;&gt;如要從其它程式中直接進行抓詞查詢，請先在&lt;b&gt;選項&lt;/b&gt;中啟用「螢幕取詞功能」，接著按上面的「彈出功能表」圖示，或是右鍵按系統匣圖示後從彈出功能表中選定「螢幕取詞」以啟動此功能。</translation>
+        <translation>&lt;h3 align=&quot;center&quot;&gt;使用螢幕取詞功能&lt;/h3&gt;&lt;p style=&quot;text-indent:2em&quot;&gt;如要從其它程式中直接抓詞查詢，請先在&lt;b&gt;偏好設定&lt;/b&gt;中啟用「螢幕取詞功能」，接著按一下主視窗的「螢幕取詞」圖示，或在系統匣圖示上按右鍵，從選單中選定「螢幕取詞」以啟動此功能。</translation>
     </message>
     <message>
         <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
@@ -60,7 +60,7 @@
     </message>
     <message>
         <source>Then just select any word you want to look up in another application by your mouse (double-click it or swipe it with mouse with the button pressed), and a window would pop up which would describe the word to you.</source>
-        <translation>然後只要用滑鼠指標選定你要進行抓詞查詢的詞（按兩下單字或是用滑鼠拖拉選定），程式就會在蹦現式視窗中顯示釋義。</translation>
+        <translation>然後只要用滑鼠游標選定你要進行抓詞查詢的詞（按兩下單字或是用滑鼠拖拉選定），程式就會在彈出式視窗中顯示釋義。</translation>
     </message>
     <message>
         <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
@@ -68,19 +68,19 @@
     </message>
     <message>
         <source>&lt;h3 align=&quot;center&quot;&gt;Welcome to &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Edit|Dictionaries&lt;/b&gt; to add some directory paths where to search for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups.&lt;p&gt;And then you&apos;re ready to look up your words! You can do that in this window by using a pane to the left, or you can &lt;a href=&quot;Working with popup&quot;&gt;look up words from other active applications&lt;/a&gt;. &lt;p&gt;To customize program, check out the available preferences at &lt;b&gt;Edit|Preferences&lt;/b&gt;. All settings there have tooltips, be sure to read them if you are in doubt about anything.&lt;p&gt;Should you need further help, have any questions, suggestions or just wonder what the others think, you are welcome at the program&apos;s &lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;http://goldendict.org/&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</source>
-        <translation type="unfinished">&lt;h3 align=&quot;center&quot;&gt;歡迎使用 &lt;b&gt;GoldenDict&lt;/b&gt; 詞典程式！&lt;/h3&gt;&lt;p style=&quot;text-indent:2em&quot;&gt;使用時請首先開啟&lt;b&gt;編輯 | 詞典&lt;/b&gt;功能表以新增並掃描含有詞典檔案的資料夾，然後新增維基百科網站查詢或其它資源，再調整詞典排序或建立新的詞典群組。&lt;p style=&quot;text-indent:2em&quot;&gt;這些設定都完成以後，就可以開始使用了。你可以使用左側的查詢面板，或是&lt;a href=&quot;使用螢幕取詞功能&quot;&gt;直接從其它程式中抓詞查詢&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要改變設定，可以在&lt;b&gt;編輯 | 選項&lt;/b&gt;功能表中檢視一下可用的系統設定。所有的設定都有滑鼠指標提示資訊，如果有不明之處，請仔細閱讀提示資訊。&lt;p style=&quot;text-indent:2em&quot;&gt;如果你需要更多說明，有任何疑問、建議，或是僅僅想了解其他人的想法，歡迎拜訪此程式的&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;官方論壇&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要取得程式更新的訊息，歡迎拜訪此程式的&lt;a href=&quot;http://goldendict.org/&quot;&gt;官方網站&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;(c) 2008-2013 Konstantin Isakov. 授權基於 GPLv3 或更高版本。</translation>
+        <translation>&lt;h3 align=&quot;center&quot;&gt;歡迎使用 &lt;b&gt;GoldenDict&lt;/b&gt; 查字典程式！&lt;/h3&gt;&lt;p style=&quot;text-indent:2em&quot;&gt;使用時請首先開啟&lt;b&gt;編輯 | 字典&lt;/b&gt;功能表以新增並掃描含有字典檔案的資料夾，然後新增維基百科網站查詢或其它資源，再調整字典排序或建立新的字典群組。&lt;p style=&quot;text-indent:2em&quot;&gt;這些設定都完成以後，就可以開始使用了。你可以使用左側的查詢面板，或是&lt;a href=&quot;使用螢幕取詞功能&quot;&gt;直接從其它程式中抓詞查詢&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需自訂本程式，可以在&lt;b&gt;編輯 | 偏好設定&lt;/b&gt;功能表中檢視可用的設定。所有的設定都有滑鼠游標提示資訊，如果有不明之處，請看一下提示。&lt;p style=&quot;text-indent:2em&quot;&gt;如果你需要更多說明、有任何疑問、建議，或是想了解其他人的想法，歡迎拜訪此程式的&lt;a href=&quot;http://goldendict.org/forum/&quot;&gt;官方論壇&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要取得程式更新，歡迎拜訪此程式的&lt;a href=&quot;http://goldendict.org/&quot;&gt;官方網站&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;(c) 2008-2013 Konstantin Isakov. 授權基於 GPLv3 或更高版本。</translation>
     </message>
     <message>
         <source>(picture)</source>
-        <translation type="unfinished"></translation>
+        <translation>(圖片)</translation>
     </message>
     <message>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>展開條目</translation>
     </message>
     <message>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>收縮條目</translation>
     </message>
 </context>
 <context>
@@ -107,11 +107,11 @@
     </message>
     <message>
         <source>Expand article</source>
-        <translation type="unfinished"></translation>
+        <translation>展開條目</translation>
     </message>
     <message>
         <source>Collapse article</source>
-        <translation type="unfinished"></translation>
+        <translation>收縮條目</translation>
     </message>
 </context>
 <context>
@@ -162,7 +162,7 @@
     </message>
     <message>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
-        <translation>在新標籤頁中尋找 &quot;%1&quot;(&amp;N)</translation>
+        <translation>在新分頁中尋找 &quot;%1&quot;(&amp;N)</translation>
     </message>
     <message>
         <source>GoldenDict</source>
@@ -190,11 +190,11 @@
     </message>
     <message>
         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
-        <translation>在 %2 中尋找 &quot;%1&quot; 並使用新標籤頁(&amp;N)</translation>
+        <translation>在 %2 中尋找 &quot;%1&quot; 並使用新分頁(&amp;N)</translation>
     </message>
     <message>
         <source>Open Link in New &amp;Tab</source>
-        <translation>在新標籤頁中開啟連結(&amp;T)</translation>
+        <translation>在新分頁中開啟連結(&amp;T)</translation>
     </message>
     <message>
         <source>Open Link in &amp;External Browser</source>
@@ -206,119 +206,138 @@
     </message>
     <message>
         <source>To enable playback of files different than WAV, please go to Edit|Preferences, choose the Audio tab and select &quot;Play via DirectShow&quot; there.</source>
-        <translation type="obsolete">要播放非 WAV 檔案，請進入 編輯|選項，選取音訊標籤，選擇「透過 DirectShow 播放」。</translation>
+        <translation type="obsolete">要播放非 WAV 檔案，請進入 編輯|偏好設定，選取音訊標籤，選擇「透過 DirectShow 播放」。</translation>
     </message>
     <message>
         <source>Highlight &amp;all</source>
-        <translation type="unfinished"></translation>
+        <translation>全部醒目提示(&amp;a)</translation>
     </message>
     <message>
         <source>Resource</source>
-        <translation type="unfinished"></translation>
+        <translation>資源</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>音訊</translation>
     </message>
     <message>
         <source>Definition: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>定義： %1</translation>
     </message>
     <message>
         <source>The referenced audio program doesn&apos;t exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>引用的音訊程式不存在。</translation>
     </message>
     <message>
         <source>WARNING: %1</source>
-        <translation type="unfinished">警告： %1</translation>
+        <translation>警告： %1</translation>
     </message>
     <message>
         <source>&amp;Add &quot;%1&quot; to history</source>
-        <translation type="unfinished"></translation>
+        <translation>將 &quot;%1&quot; 新增至歷史紀錄(&amp;A) </translation>
     </message>
     <message>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>字典 &quot;%1&quot; 的定義： %2</translation>
     </message>
     <message>
         <source>Send &quot;%1&quot; to input line</source>
-        <translation type="unfinished"></translation>
+        <translation>把 &quot;%1&quot; 傳送到輸入列</translation>
     </message>
     <message>
         <source>Picture</source>
-        <translation type="unfinished"></translation>
+        <translation>圖片</translation>
     </message>
     <message>
         <source>Select Current Article</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇目前條目</translation>
     </message>
     <message>
         <source>ERROR: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>錯誤：%1</translation>
     </message>
     <message>
         <source>Save sound</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存發音</translation>
     </message>
     <message>
         <source>Sound files (*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>發音檔(*.wav *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;所有檔案 (*.*)</translation>
     </message>
     <message>
         <source>Save image</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存圖片</translation>
     </message>
     <message>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>圖片檔(*.bmp *.jpg *.png *.tif);;所有檔案 (*.*) </translation>
     </message>
     <message>
         <source>Save &amp;image...</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存圖片...(&amp;i)</translation>
     </message>
     <message>
         <source>Save s&amp;ound...</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存發音...(&amp;o)</translation>
     </message>
     <message>
         <source>TTS Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>文字轉語音聲音</translation>
     </message>
     <message>
         <source>WARNING: FFmpeg Audio Player: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>警告： FFmpeg 音訊撥放程式： %1</translation>
     </message>
     <message>
         <source>Copy as text</source>
-        <translation type="unfinished"></translation>
+        <translation>以純文字複製</translation>
     </message>
     <message>
         <source>Inspect</source>
-        <translation type="unfinished"></translation>
+        <translation>檢查原始碼</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>影像</translation>
     </message>
     <message>
         <source>Video: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>影像： %1</translation>
     </message>
 </context>
 <context>
     <name>BelarusianTranslit</name>
     <message>
         <source>Belarusian transliteration from latin to cyrillic (classic orthography)</source>
-        <translation type="unfinished"></translation>
+        <translation>白俄羅斯語轉寫──拉丁文至斯拉夫字母(傳統正字法)</translation>
     </message>
     <message>
         <source>Belarusian transliteration from latin to cyrillic (school orthography)</source>
-        <translation type="unfinished"></translation>
+        <translation>白俄羅斯語轉寫──拉丁文至斯拉夫字母(學院正字法)</translation>
     </message>
     <message>
         <source>Belarusian transliteration (smoothes out the difference
 between classic and school orthography in cyrillic)</source>
-        <translation type="unfinished"></translation>
+        <translation>白俄羅斯語轉寫(消弭傳統正字法和學院正字法之間的差異)</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <source>Proxy authentication required</source>
+        <translation>必須提供代理伺服器的驗證</translation>
+    </message>
+    <message>
+        <source>You need to supply a Username and a Password to access via proxy</source>
+        <translation>如果你要透過代理伺服器來存取，需要提供用戶名和密碼</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>用戶名：</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>密碼：</translation>
     </message>
 </context>
 <context>
@@ -376,26 +395,117 @@
     </message>
     <message>
         <source>Dictionaries: </source>
-        <translation type="unfinished"></translation>
+        <translation>字典： </translation>
     </message>
     <message>
         <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>依來源語言合併分組至 &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
         <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>依目標語言合併分組至 &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
         <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>製作雙向翻譯組 &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
         <source>Combine groups with &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>與 &quot;%1&quot; 合併分組</translation>
     </message>
     <message>
         <source>Unassigned</source>
+        <translation>未指定</translation>
+    </message>
+</context>
+<context>
+    <name>DictHeadwords</name>
+    <message>
+        <source>Search mode</source>
+        <translation>搜尋模式</translation>
+    </message>
+    <message>
+        <source>This element determines how filter string will be interpreted</source>
+        <translation>此部份決定如何解釋欲篩選的字串</translation>
+    </message>
+    <message>
+        <source>If checked on the symbols case will be take in account when filtering</source>
+        <translation>勾選後，大小寫就會視為不同</translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation>符合大小寫</translation>
+    </message>
+    <message>
+        <source>Exports headwords to file</source>
+        <translation>將標題字匯出至檔案</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation>匯出</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Press this button to apply filter to headwords list</source>
+        <translation>按下此按鈕，將篩選器套用至標題字列表</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>套用</translation>
+    </message>
+    <message>
+        <source>If checked any filter changes will we immediately applied to headwords list</source>
+        <translation>假如勾選的話，如果篩選器有任何變動，都會立即套用至標題字列表</translation>
+    </message>
+    <message>
+        <source>Auto apply</source>
+        <translation>自動套用</translation>
+    </message>
+    <message>
+        <source>Filter:</source>
+        <translation>篩選器：</translation>
+    </message>
+    <message>
+        <source>Filter string (fixed string, wildcards or regular expression)</source>
+        <translation>篩選字串(固定字串、萬用字元或正規表達式)</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>文字</translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation>萬用字元</translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation>正規表達式</translation>
+    </message>
+    <message>
+        <source>Unique headwords total: %1, filtered: %2</source>
+        <translation>獨特標題字總數： %1,已篩選： %2</translation>
+    </message>
+    <message>
+        <source>Save headwords to file</source>
+        <translation>將標題字儲存成檔案</translation>
+    </message>
+    <message>
+        <source>Text files (*.txt);;All files (*.*)</source>
+        <translation>文字檔 (*.txt);;所有檔案 (*.*)</translation>
+    </message>
+    <message>
+        <source>Export headwords...</source>
+        <translation>匯出標題字...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -403,40 +513,49 @@
     <name>DictInfo</name>
     <message>
         <source>Total articles:</source>
-        <translation type="unfinished">文章總數：</translation>
+        <translation>條目總數：</translation>
     </message>
     <message>
         <source>Translates from:</source>
-        <translation type="unfinished">詞條語言：</translation>
+        <translation>翻譯自：</translation>
     </message>
     <message>
         <source>Total words:</source>
-        <translation type="unfinished">詞條總數：</translation>
+        <translation>總字數：</translation>
     </message>
     <message>
         <source>Translates to:</source>
-        <translation type="unfinished">釋義語言：</translation>
+        <translation>翻譯至：</translation>
     </message>
     <message>
         <source>Files comprising this dictionary:</source>
-        <translation type="unfinished">此詞典包含的檔案：</translation>
+        <translation>此字典包含的檔案：</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>描述：</translation>
     </message>
     <message>
         <source>Open folder</source>
-        <translation type="unfinished"></translation>
+        <translation>打開資料夾</translation>
     </message>
     <message>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>編輯字典</translation>
     </message>
     <message>
         <source>Edit the dictionary via command:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>以指令編輯字典：
+%1</translation>
+    </message>
+    <message>
+        <source>Show all unique dictionary headwords</source>
+        <translation>顯示所有獨特的字典標題字</translation>
+    </message>
+    <message>
+        <source>Headwords</source>
+        <translation>標題字</translation>
     </message>
 </context>
 <context>
@@ -447,10 +566,68 @@
     </message>
 </context>
 <context>
+    <name>DictServer</name>
+    <message>
+        <source>Url: </source>
+        <translation>Url: </translation>
+    </message>
+    <message>
+        <source>Databases: </source>
+        <translation>資料庫：</translation>
+    </message>
+    <message>
+        <source>Search strategies: </source>
+        <translation>搜尋策略：</translation>
+    </message>
+    <message>
+        <source>Server databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DictServersModel</name>
+    <message>
+        <source>Enabled</source>
+        <translation>已啟用</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>名稱</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    <message>
+        <source>Databases</source>
+        <translation>資料庫</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>圖示</translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of databases
+(empty string or &quot;*&quot; matches all databases)</source>
+        <translation>資料庫的逗號分隔列表
+(空字串或&quot;*&quot;複合所有的資料庫)</translation>
+    </message>
+    <message>
+        <source>Strategies</source>
+        <translation>策略</translation>
+    </message>
+    <message>
+        <source>Comma-delimited list of search strategies
+(empty string mean &quot;prefix&quot; strategy)</source>
+        <translation>搜尋策略的的逗號分隔列表
+(空字串代表 &quot;prefix&quot; 策略)</translation>
+    </message>
+</context>
+<context>
     <name>DictionaryBar</name>
     <message>
         <source>Dictionary Bar</source>
-        <translation type="obsolete">詞典欄</translation>
+        <translation type="obsolete">字典欄</translation>
     </message>
     <message>
         <source>Edit this group</source>
@@ -458,34 +635,38 @@
     </message>
     <message>
         <source>Dictionary info</source>
-        <translation type="unfinished"></translation>
+        <translation>字典資訊</translation>
     </message>
     <message>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>編輯字典</translation>
     </message>
     <message>
         <source>&amp;Dictionary Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>字典欄(&amp;D)</translation>
     </message>
     <message>
         <source>Open dictionary folder</source>
-        <translation type="unfinished"></translation>
+        <translation>打開字典資料夾</translation>
     </message>
     <message>
         <source>Extended menu with all dictionaries...</source>
-        <translation type="unfinished"></translation>
+        <translation>展開所有字典的選單...</translation>
+    </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation>字典標頭</translation>
     </message>
 </context>
 <context>
     <name>EditDictionaries</name>
     <message>
         <source>&amp;Dictionaries</source>
-        <translation>詞典(&amp;D)</translation>
+        <translation>字典(&amp;D)</translation>
     </message>
     <message>
         <source>Dictionaries</source>
-        <translation>詞典</translation>
+        <translation>字典</translation>
     </message>
     <message>
         <source>Accept</source>
@@ -497,11 +678,11 @@
     </message>
     <message>
         <source>Sources changed</source>
-        <translation>詞典檔案所在資料夾已變更</translation>
+        <translation>字典檔案所在資料夾已變更</translation>
     </message>
     <message>
         <source>&amp;Sources</source>
-        <translation>詞典來源(&amp;S)</translation>
+        <translation>字典來源(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
@@ -509,14 +690,83 @@
     </message>
     <message>
         <source>Some sources were changed. Would you like to accept the changes?</source>
-        <translation>某些詞典檔案的所在資料夾已變更，是否接受變更？</translation>
+        <translation>某些字典檔案的所在資料夾已變更，是否接受變更？</translation>
     </message>
 </context>
 <context>
     <name>ExternalViewer</name>
     <message>
         <source>the viewer program name is empty</source>
-        <translation type="unfinished"></translation>
+        <translation>檢視程式的名稱是空白的</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FtsIndexing</name>
+    <message>
+        <source>None</source>
+        <translation>無</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::FullTextSearchDialog</name>
+    <message>
+        <source>Full-text search</source>
+        <translation>全文搜尋</translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation>全字(Whoe words)</translation>
+    </message>
+    <message>
+        <source>Plain text</source>
+        <translation>純文字</translation>
+    </message>
+    <message>
+        <source>Wildcards</source>
+        <translation>萬用字元</translation>
+    </message>
+    <message>
+        <source>RegExp</source>
+        <translation>正規表達式</translation>
+    </message>
+    <message>
+        <source>Max distance between words (%1-%2):</source>
+        <translation>文字間最大距離 (%1-%2)</translation>
+    </message>
+    <message>
+        <source>Max articles per dictionary (%1-%2):</source>
+        <translation>每個字典的條目上限(%1-%2)：</translation>
+    </message>
+    <message>
+        <source>Articles found: </source>
+        <translation>找到的條目：</translation>
+    </message>
+    <message>
+        <source>Now indexing: </source>
+        <translation>索引中：</translation>
+    </message>
+    <message>
+        <source>The search line must contains at least one word containing </source>
+        <translation>搜尋列至少必須包括</translation>
+    </message>
+    <message>
+        <source> or more symbols</source>
+        <translation>或更多文字</translation>
+    </message>
+    <message>
+        <source>No dictionaries for full-text search</source>
+        <translation>沒有字典可用於全文搜尋</translation>
+    </message>
+    <message>
+        <source>CJK symbols in search string are not compatible with search modes &quot;Whole words&quot; and &quot;Plain text&quot;</source>
+        <translation>搜尋的字串中，如果有中日韓(CJK)字母，就無法相容&quot;全字(Whole words)&quot; 和 &quot;純文字&quot;的搜尋模式</translation>
+    </message>
+</context>
+<context>
+    <name>FTS::Indexing</name>
+    <message>
+        <source>None</source>
+        <translation>無</translation>
     </message>
 </context>
 <context>
@@ -547,7 +797,54 @@
     </message>
     <message>
         <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
-        <translation>進入 編輯|詞典|詞典來源|Forvo, 申請自己的 API-key 來消除此錯誤。</translation>
+        <translation>進入 編輯|字典|字典來源|Forvo, 申請自己的 API-key 來消除此錯誤。</translation>
+    </message>
+</context>
+<context>
+    <name>FullTextSearchDialog</name>
+    <message>
+        <source>Search</source>
+        <translation>搜尋</translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation>符合大小寫</translation>
+    </message>
+    <message>
+        <source>Mode:</source>
+        <translation>模式：</translation>
+    </message>
+    <message>
+        <source>Articles found:</source>
+        <translation>找到條目：</translation>
+    </message>
+    <message>
+        <source>Available dictionaries in group:</source>
+        <translation>群組中可用的字典：</translation>
+    </message>
+    <message>
+        <source>Wait for indexing:</source>
+        <translation>等候索引：</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>總共：</translation>
+    </message>
+    <message>
+        <source>Indexed:</source>
+        <translation>已索引：</translation>
+    </message>
+    <message>
+        <source>Now indexing: None</source>
+        <translation>正在索引：無</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -602,7 +899,7 @@
     </message>
     <message>
         <source>Tab 2</source>
-        <translation>標籤頁 2</translation>
+        <translation>分頁 2</translation>
     </message>
     <message>
         <source>Are you sure you want to remove all the groups?</source>
@@ -626,7 +923,7 @@
     </message>
     <message>
         <source>Dictionaries available:</source>
-        <translation>可用詞典：</translation>
+        <translation>可用字典：</translation>
     </message>
     <message>
         <source>&amp;Add group</source>
@@ -638,19 +935,19 @@
     </message>
     <message>
         <source>Create new dictionary group</source>
-        <translation>建立新的詞典群組</translation>
+        <translation>建立新的字典群組</translation>
     </message>
     <message>
         <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
-        <translation>可以用滑鼠拖曳詞典以改變其群組設定或排序。(&amp;D)</translation>
+        <translation>可以用滑鼠拖曳字典以改變其群組設定或排序(&amp;D)。</translation>
     </message>
     <message>
         <source>Rename current dictionary group</source>
-        <translation>重新命名當前詞典群組</translation>
+        <translation>重新命名當前字典群組</translation>
     </message>
     <message>
         <source>Remove current dictionary group</source>
-        <translation>移除詞典群組</translation>
+        <translation>移除字典群組</translation>
     </message>
     <message>
         <source>Give a name for the new group:</source>
@@ -662,11 +959,11 @@
     </message>
     <message>
         <source>Remove selected dictionaries from group (Del)</source>
-        <translation>將所選詞典從群組中移除(Del)</translation>
+        <translation>將所選字典從群組中移除(Del)</translation>
     </message>
     <message>
         <source>Add selected dictionaries to group (Ins)</source>
-        <translation>將所選詞典新增進群組(Ins)</translation>
+        <translation>將所選字典新增進群組(Ins)</translation>
     </message>
     <message>
         <source>&amp;Remove group</source>
@@ -682,7 +979,7 @@
     </message>
     <message>
         <source>Remove all dictionary groups</source>
-        <translation>移除全部詞典群組</translation>
+        <translation>移除全部字典群組</translation>
     </message>
     <message>
         <source>Create language-based groups</source>
@@ -692,28 +989,75 @@
         <source>Auto groups</source>
         <translation>自動分組</translation>
     </message>
+    <message>
+        <source>Group tabs</source>
+        <translation>群組分頁</translation>
+    </message>
+    <message>
+        <source>Open groups list</source>
+        <translation>打開字典群組列表</translation>
+    </message>
+</context>
+<context>
+    <name>Help::HelpWindow</name>
+    <message>
+        <source>GoldenDict help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">放大</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">縮小</translation>
+    </message>
+    <message>
+        <source>Normal Size</source>
+        <translation type="unfinished">正常大小</translation>
+    </message>
+    <message>
+        <source>Content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HistoryPaneWidget</name>
     <message>
         <source>&amp;Delete Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>刪除選擇的部分(&amp;D)</translation>
     </message>
     <message>
         <source>Copy Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>複製選擇的部分</translation>
     </message>
     <message>
         <source>History:</source>
-        <translation type="unfinished"></translation>
+        <translation>歷史紀錄：</translation>
     </message>
     <message>
         <source>%1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1/%2</translation>
     </message>
     <message>
         <source>History size: %1 entries out of maximum %2</source>
-        <translation type="unfinished"></translation>
+        <translation>歷史紀錄的大小： %1 個條目，最多 %2 個</translation>
     </message>
 </context>
 <context>
@@ -742,7 +1086,7 @@
     <name>Initializing</name>
     <message>
         <source>Dictionary Name</source>
-        <translation>詞典名稱</translation>
+        <translation>字典名稱</translation>
     </message>
     <message>
         <source>GoldenDict - Initializing</source>
@@ -750,7 +1094,7 @@
     </message>
     <message>
         <source>Please wait while indexing dictionary</source>
-        <translation>正在索引詞典，請稍候</translation>
+        <translation>正在索引字典，請稍候</translation>
     </message>
     <message>
         <source>Please wait...</source>
@@ -1341,7 +1685,7 @@
     </message>
     <message>
         <source>Chinese</source>
-        <translation>漢語</translation>
+        <translation>中文</translation>
     </message>
     <message>
         <source>Chuvash</source>
@@ -1501,81 +1845,81 @@
     </message>
     <message>
         <source>Traditional Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>繁體中文</translation>
     </message>
     <message>
         <source>Simplified Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>簡體中文</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>其他</translation>
     </message>
     <message>
         <source>Other Simplified Chinese dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>其他簡體中文方言</translation>
     </message>
     <message>
         <source>Other Traditional Chinese dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>其他繁體中文方言</translation>
     </message>
     <message>
         <source>Other Eastern-European languages</source>
-        <translation type="unfinished"></translation>
+        <translation>其他東歐語言</translation>
     </message>
     <message>
         <source>Other Western-European languages</source>
-        <translation type="unfinished"></translation>
+        <translation>其他西歐語言</translation>
     </message>
     <message>
         <source>Other Russian languages</source>
-        <translation type="unfinished"></translation>
+        <translation>其他俄羅斯文</translation>
     </message>
     <message>
         <source>Other Japanese languages</source>
-        <translation type="unfinished"></translation>
+        <translation>其他日文</translation>
     </message>
     <message>
         <source>Other Baltic languages</source>
-        <translation type="unfinished"></translation>
+        <translation>其他波羅的海語言</translation>
     </message>
     <message>
         <source>Other Greek languages</source>
-        <translation type="unfinished"></translation>
+        <translation>其他希臘文</translation>
     </message>
     <message>
         <source>Other Korean dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>其他韓文方言</translation>
     </message>
     <message>
         <source>Other Turkish dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>其他土耳其方言</translation>
     </message>
     <message>
         <source>Other Thai dialects</source>
-        <translation type="unfinished"></translation>
+        <translation>其他泰文方言</translation>
     </message>
     <message>
         <source>Tamazight</source>
-        <translation type="unfinished"></translation>
+        <translation>塔馬齊格特語</translation>
     </message>
     <message>
         <source>Lojban</source>
-        <translation type="unfinished"></translation>
+        <translation>邏輯語</translation>
     </message>
 </context>
 <context>
     <name>LoadDictionaries</name>
     <message>
         <source>Error loading dictionaries</source>
-        <translation>讀取詞典出錯</translation>
+        <translation>讀取字典時出錯</translation>
     </message>
 </context>
 <context>
     <name>Main</name>
     <message>
         <source>Error in configuration file. Continue with default settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>設定檔有問題，要使用預設的設定嗎？</translation>
     </message>
 </context>
 <context>
@@ -1590,7 +1934,7 @@
     </message>
     <message>
         <source>F3</source>
-        <translation type="unfinished">F3</translation>
+        <translation>F3</translation>
     </message>
     <message>
         <source>F4</source>
@@ -1610,7 +1954,7 @@
     </message>
     <message>
         <source>%1 dictionaries, %2 articles, %3 words</source>
-        <translation>詞典數：%1，文章數：%2，詞條數：%3</translation>
+        <translation>字典數：%1，條目數：%2，單字數：%3</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
@@ -1646,7 +1990,7 @@
     </message>
     <message>
         <source>Can&apos;t save article: %1</source>
-        <translation>無法儲存文章：%1</translation>
+        <translation>無法儲存條目：%1</translation>
     </message>
     <message>
         <source>Zoom In</source>
@@ -1654,7 +1998,7 @@
     </message>
     <message>
         <source>&amp;Dictionaries...</source>
-        <translation>詞典...(&amp;D)</translation>
+        <translation>字典...(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;About</source>
@@ -1670,11 +2014,11 @@
     </message>
     <message>
         <source>&amp;Save Article</source>
-        <translation>儲存文章(&amp;S)</translation>
+        <translation>儲存條目(&amp;S)</translation>
     </message>
     <message>
         <source>Save Article As</source>
-        <translation>文章另存新檔</translation>
+        <translation>條目另存新檔</translation>
     </message>
     <message>
         <source>Ctrl+P</source>
@@ -1767,7 +2111,9 @@
     </message>
     <message>
         <source>Loading...</source>
-        <translation>載入中……</translation>
+        <translation>載入中
+
+</translation>
     </message>
     <message>
         <source>(untitled)</source>
@@ -1775,7 +2121,7 @@
     </message>
     <message>
         <source>&amp;Preferences...</source>
-        <translation>選項...(&amp;P)</translation>
+        <translation>偏好設定...(&amp;P)</translation>
     </message>
     <message>
         <source>Html files (*.html *.htm)</source>
@@ -1791,7 +2137,7 @@
     </message>
     <message>
         <source>Save Article</source>
-        <translation>儲存文章</translation>
+        <translation>儲存條目</translation>
     </message>
     <message>
         <source>Skip This Release</source>
@@ -1807,7 +2153,7 @@
     </message>
     <message>
         <source>Print Article</source>
-        <translation>列印文章</translation>
+        <translation>列印條目</translation>
     </message>
     <message>
         <source>No printer is available. Please install one first.</source>
@@ -1823,7 +2169,7 @@
     </message>
     <message>
         <source>Show Names in Dictionary Bar</source>
-        <translation type="obsolete">在詞典欄中顯示詞典名稱</translation>
+        <translation type="obsolete">在字典欄中顯示字典名稱</translation>
     </message>
     <message>
         <source>H&amp;istory</source>
@@ -1851,190 +2197,224 @@
     </message>
     <message>
         <source>Close current tab</source>
-        <translation>關閉當前標籤頁</translation>
+        <translation>關閉當前分頁</translation>
     </message>
     <message>
         <source>Close all tabs</source>
-        <translation>關閉所有標籤頁</translation>
+        <translation>關閉所有分頁</translation>
     </message>
     <message>
         <source>Close all tabs except current</source>
-        <translation>關閉其它標籤頁</translation>
+        <translation>關閉其它分頁</translation>
     </message>
     <message>
         <source>Opened tabs</source>
-        <translation>已開啟的標籤頁</translation>
+        <translation>已開啟的分頁</translation>
     </message>
     <message>
         <source>New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>新分頁</translation>
     </message>
     <message>
         <source>Ctrl+T</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
         <source>&amp;Configuration Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>設定檔資料夾(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>選單列(&amp;M)</translation>
     </message>
     <message>
         <source>Found in Dictionaries:</source>
-        <translation type="unfinished"></translation>
+        <translation>在下列字典中找到：</translation>
     </message>
     <message>
         <source>Open Tabs List</source>
-        <translation type="unfinished"></translation>
+        <translation>打開分頁列表</translation>
     </message>
     <message>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
     <message>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
-        <translation type="unfinished"></translation>
+        <translation>您已隱藏選單列，可使用 %1 來顯示選單列。</translation>
     </message>
     <message>
         <source>Ctrl+M</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished"></translation>
+        <translation>匯出(&amp;E)</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>隱藏(&amp;H)</translation>
     </message>
     <message>
         <source>Export history to file</source>
-        <translation type="unfinished"></translation>
+        <translation>匯出歷史紀錄</translation>
     </message>
     <message>
         <source>Text files (*.txt);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>文字檔 (*.txt);;所有檔案 (*.*)</translation>
     </message>
     <message>
         <source>History export complete</source>
-        <translation type="unfinished"></translation>
+        <translation>成功匯出歷史紀錄</translation>
     </message>
     <message>
         <source>Export error: </source>
-        <translation type="unfinished"></translation>
+        <translation>匯出失敗： </translation>
     </message>
     <message>
         <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+H</translation>
     </message>
     <message>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>匯入(&amp;I)</translation>
     </message>
     <message>
         <source>Import history from file</source>
-        <translation type="unfinished"></translation>
+        <translation>匯入歷史紀錄</translation>
     </message>
     <message>
         <source>Import error: invalid data in file</source>
-        <translation type="unfinished"></translation>
+        <translation>匯入失敗： 檔案中無效的日期</translation>
     </message>
     <message>
         <source>History import complete</source>
-        <translation type="unfinished"></translation>
+        <translation>成功匯入歷史紀錄</translation>
     </message>
     <message>
         <source>Import error: </source>
-        <translation type="unfinished"></translation>
+        <translation>匯入失敗： </translation>
     </message>
     <message>
         <source>Dictionary info</source>
-        <translation type="unfinished"></translation>
+        <translation>字典資訊</translation>
     </message>
     <message>
         <source>Edit dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>編輯字典</translation>
     </message>
     <message>
         <source>&amp;Search Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>搜尋列(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Results Navigation Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>結果導覽列(&amp;R)</translation>
     </message>
     <message>
         <source>Print Pre&amp;view</source>
-        <translation type="unfinished"></translation>
+        <translation>預覽列印(&amp;v)</translation>
     </message>
     <message>
         <source>&amp;Rescan Files</source>
-        <translation type="unfinished"></translation>
+        <translation>重新掃描檔案(&amp;R)</translation>
     </message>
     <message>
         <source>&amp;New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>新分頁(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Always on Top</source>
-        <translation type="unfinished"></translation>
+        <translation>最上層顯示(&amp;A)</translation>
     </message>
     <message>
         <source>Always on Top</source>
-        <translation type="unfinished"></translation>
+        <translation>最上層顯示</translation>
     </message>
     <message>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <source>Menu Button</source>
-        <translation type="unfinished"></translation>
+        <translation>選單按鈕</translation>
     </message>
     <message>
         <source>Show Names in Dictionary &amp;Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>在字典列中顯示字典名稱(&amp;B)</translation>
     </message>
     <message>
         <source>Show Small Icons in &amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>在工具列中顯示小圖示(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Navigation</source>
-        <translation type="unfinished"></translation>
+        <translation>導覽(&amp;N)</translation>
     </message>
     <message>
         <source>The main window is set to be always on top.</source>
-        <translation type="unfinished"></translation>
+        <translation>主視窗設定為最上層顯示。</translation>
     </message>
     <message>
         <source>&amp;History Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>歷史紀錄(&amp;H)</translation>
     </message>
     <message>
         <source>Accessibility API is not enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>未啟用協助存取 API</translation>
     </message>
     <message>
         <source>Article, Complete (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>條目，完整 (*.html)</translation>
     </message>
     <message>
         <source>Article, HTML Only (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>條目，僅HTML部分 (*.html)</translation>
     </message>
     <message>
         <source>Saving article...</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存條目...</translation>
     </message>
     <message>
         <source>Open dictionary folder</source>
+        <translation>打開字典資料夾</translation>
+    </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation>字典標頭</translation>
+    </message>
+    <message>
+        <source>String to search in dictionaries. The wildcards &apos;*&apos;, &apos;?&apos; and sets of symbols &apos;[...]&apos; are allowed.
+To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectively</source>
+        <translation>欲搜尋的字串。可使用萬用字元  &apos;*&apos;，&apos;?&apos; 和字元集合&apos;[...]&apos;。
+若想尋找&apos;*&apos;、&apos;?&apos;、&apos;[&apos;、&apos;]&apos;等符號，請分別使用 &apos;*&apos;、&apos;?&apos;、&apos;[&apos;、&apos;]&apos;</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>搜尋</translation>
+    </message>
+    <message>
+        <source>Search in page</source>
+        <translation>在頁面中尋找</translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation>全文搜尋</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+F</source>
+        <translation>Ctrl+Shift+F</translation>
+    </message>
+    <message>
+        <source>GoldenDict reference</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2042,11 +2422,11 @@
     <name>Mdx::MdxArticleRequest</name>
     <message>
         <source>Dictionary file was tampered or corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>字典檔案已遭竄改或已損壞</translation>
     </message>
     <message>
         <source>Failed loading article from %1, reason: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>從 %1 讀取條目時失敗，原因是： %2</translation>
     </message>
 </context>
 <context>
@@ -2079,14 +2459,14 @@
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>圖示</translation>
     </message>
 </context>
 <context>
     <name>OrderAndProps</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <source>Form</source>
@@ -2094,7 +2474,7 @@
     </message>
     <message>
         <source>Inactive (disabled) dictionaries:</source>
-        <translation>未啟用（已禁用）的詞典：</translation>
+        <translation>未啟用（已禁用）的字典：</translation>
     </message>
     <message>
         <source>Name:</source>
@@ -2102,7 +2482,7 @@
     </message>
     <message>
         <source>Total articles:</source>
-        <translation>文章總數：</translation>
+        <translation>條目總數：</translation>
     </message>
     <message>
         <source>Translates from:</source>
@@ -2118,30 +2498,38 @@
     </message>
     <message>
         <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
-        <translation>可以透過拖曳改變項目的排序。將詞典放入未啟用的群組以禁用。</translation>
+        <translation>可以透過拖曳改變項目的排序。將字典放入未啟用的群組以禁用。</translation>
     </message>
     <message>
         <source>Dictionary order:</source>
-        <translation>詞典排序：</translation>
+        <translation>字典排序：</translation>
     </message>
     <message>
         <source>Files comprising this dictionary:</source>
-        <translation>此詞典包含的檔案：</translation>
+        <translation>此字典包含的檔案：</translation>
     </message>
     <message>
         <source>Dictionary information</source>
-        <translation>詞典資訊</translation>
+        <translation>字典資訊</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>描述</translation>
     </message>
     <message>
         <source>Sort by name</source>
-        <translation type="unfinished"></translation>
+        <translation>依名稱排序</translation>
     </message>
     <message>
         <source>Sort by languages</source>
+        <translation>依語言排序</translation>
+    </message>
+    <message>
+        <source>Dictionary headwords</source>
+        <translation>字典標頭</translation>
+    </message>
+    <message>
+        <source>Dictionaries active: %1, inactive: %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2214,8 +2602,8 @@
         <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
-        <translation>在正常情況下，開啟一個新標籤頁將會自動將其選定。
-啟用此選項將會在開啟新標籤頁時不自動選定。</translation>
+        <translation>在正常情況下，會自動跳到開啟的新分頁。
+啟用此選項後，不會自動跳至開啟的新分頁。</translation>
     </message>
     <message>
         <source>Use proxy server</source>
@@ -2235,7 +2623,7 @@
     </message>
     <message>
         <source>Auto-pronounce words in main window</source>
-        <translation>自動朗讀主視窗中的詞條</translation>
+        <translation>自動朗讀主視窗中的單字</translation>
     </message>
     <message>
         <source>Start with system</source>
@@ -2247,7 +2635,7 @@
     </message>
     <message>
         <source>Tabbed browsing</source>
-        <translation>標籤頁瀏覽</translation>
+        <translation>分頁瀏覽</translation>
     </message>
     <message>
         <source>Right Shift only</source>
@@ -2279,7 +2667,7 @@
     </message>
     <message>
         <source>Open new tabs in background</source>
-        <translation>在後台開啟新標籤頁</translation>
+        <translation>在背景開啟新分頁</translation>
     </message>
     <message>
         <source>&amp;Network</source>
@@ -2312,7 +2700,7 @@
     </message>
     <message>
         <source>Auto-pronounce words in scan popup</source>
-        <translation>自動朗讀螢幕取詞彈出視窗中的詞條</translation>
+        <translation>自動朗讀螢幕取詞彈出視窗中的單字</translation>
     </message>
     <message>
         <source>Enable scan popup functionality</source>
@@ -2320,7 +2708,7 @@
     </message>
     <message>
         <source>Open new tabs after the current one</source>
-        <translation>在當前頁之後開啟新標籤頁</translation>
+        <translation>在當前頁之後開啟新分頁</translation>
     </message>
     <message>
         <source>Restart the program to apply the language change.</source>
@@ -2335,8 +2723,8 @@
 you point your mouse on any word on the screen (Windows) or select
 any word with mouse (Linux). When enabled, you can switch it on and
 off from main window or tray icon.</source>
-        <translation>啟用後，用滑鼠指標指向一個單字（Windows下），或是
-選定一個單字（Linux下）的時候，都會出現一個蹦現式
+        <translation>啟用後，用滑鼠游標指向一個單字（Windows下），或是
+選定一個單字（Linux下）的時候，都會出現一個彈出式
 視窗來顯示釋義。啟用此功能後，可以從主視窗或系統
 匣功能表中選擇是否啟動螢幕取詞功能。</translation>
     </message>
@@ -2348,8 +2736,8 @@
         <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
-        <translation>開啟此選項，新標籤頁將會在當前頁面後開啟；不
-開啟此選項，新標籤頁將會自動新增到末尾。</translation>
+        <translation>開啟此選項，新分頁將會在當前頁面後開啟；不
+開啟此選項，新分頁將會自動新增到末尾。</translation>
     </message>
     <message>
         <source>Close to system tray</source>
@@ -2419,7 +2807,7 @@
     </message>
     <message>
         <source>Preferences</source>
-        <translation>選項</translation>
+        <translation>偏好設定</translation>
     </message>
     <message>
         <source>Keys may also be pressed afterwards, within</source>
@@ -2435,7 +2823,7 @@
     </message>
     <message>
         <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
-        <translation>熱鍵均為全域鍵，只要 GoldenDict 在後台執行，熱鍵就可以在任何程式中使用。</translation>
+        <translation>熱鍵均為全域鍵，只要 GoldenDict 在背景執行，熱鍵就可以在任何程式中使用。</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
@@ -2492,8 +2880,8 @@
         <source>Enabling this would make GoldenDict block most advertisements
 by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</source>
-        <translation>啟用此選項後，GoldenDict 將會禁止載入你所瀏覽的站台中來自其它站台的
-內容（圖片、框架）以便封殺廣告。如果某些網點因此而出現錯誤，可以試著禁
+        <translation>啟用此選項後，GoldenDict 將會阻擋你所瀏覽的站台中來自其它站台的
+內容（圖片、框架）以便封殺廣告。如果某些網站因此而出現錯誤，可以試著禁
 用此選項。</translation>
     </message>
     <message>
@@ -2544,193 +2932,233 @@
     </message>
     <message>
         <source>Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用此選項會使主視窗在只有一個分頁時隱藏分頁列。</translation>
     </message>
     <message>
         <source>Hide single tab</source>
-        <translation type="unfinished"></translation>
+        <translation>隱藏單一分頁</translation>
     </message>
     <message>
         <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
-        <translation type="unfinished"></translation>
+        <translation>一般而言，按下 ESC 鍵會將游標移至翻譯列。啟用此選項後，按下 ESC 鍵會隱藏主視窗。</translation>
     </message>
     <message>
         <source>ESC key hides main window</source>
-        <translation type="unfinished"></translation>
+        <translation>使用 ESC 鍵隱藏主視窗</translation>
     </message>
     <message>
         <source>Send translated word to main window instead of to show it in popup window</source>
-        <translation type="unfinished"></translation>
+        <translation>將翻譯的文字傳送至主視窗，而非顯示在彈出式視窗中</translation>
     </message>
     <message>
         <source>Send translated word to main window</source>
-        <translation type="unfinished"></translation>
+        <translation>將翻譯傳送至主視窗</translation>
     </message>
     <message>
         <source>Enabling this would allow to listen to sound pronunciations from
 online dictionaries that rely on Flash or other web plugins.
 Plugin must be installed for this option to work.</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用此選項後才能聆聽需要 Flash 或其他網路擴充程式才能撥放的線上字典的發音。
+需先安裝擴充程式，本選項才能順利運作。</translation>
     </message>
     <message>
         <source>Enable web plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用網路擴充程式</translation>
     </message>
     <message>
         <source>Ad&amp;vanced</source>
-        <translation type="unfinished"></translation>
+        <translation>進階設定(&amp;v)</translation>
     </message>
     <message>
         <source>ScanPopup extra technologies</source>
-        <translation type="unfinished"></translation>
+        <translation>額外的螢幕取詞技術</translation>
     </message>
     <message>
         <source>Try to use IAccessibleEx technology to retrieve word under cursor.
 This technology works only with some programs that support it
  (for example Internet Explorer 9).
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>嘗試使用 IAccessibleEx 技術來取得滑鼠游標下的單字。
+本技術僅適用支援該技術的程式(如 Internet Explorer 9 )。
+若您不使用這類程式的話，就不須勾選此選項。</translation>
     </message>
     <message>
         <source>Use &amp;IAccessibleEx</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用 &amp;IAccessibleEx</translation>
     </message>
     <message>
         <source>Try to use UI Automation technology to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>嘗試使用 UI Automation 技術來取得滑鼠游標下的單字。
+本技術僅適用支援該技術的程式。
+若您不使用這類程式的話，就不須勾選此選項。</translation>
     </message>
     <message>
         <source>Use &amp;UIAutomation</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用 &amp;UIAutomation</translation>
     </message>
     <message>
         <source>Try to use special GoldenDict message to retrieve word under cursor.
 This technology works only with some programs that support it.
 It is not needed to select this option if you don&apos;t use such programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>嘗試使用特別的 GoldenDict 訊息來取得滑鼠游標下的單字。
+本技術僅適用支援該技術的程式。
+若您不使用這類程式的話，就不須勾選此選項。</translation>
     </message>
     <message>
         <source>Use &amp;GoldenDict message</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用 &amp;GoldenDict 訊息</translation>
     </message>
     <message>
         <source>Ctrl-Tab navigates tabs in MRU order</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl-Tab 依照 MRU 順序瀏覽分頁</translation>
     </message>
     <message>
         <source>Babylon</source>
-        <translation type="unfinished"></translation>
+        <translation>Babylon</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>歷史紀錄</translation>
     </message>
     <message>
         <source>Turn this option on to store history of the translated words</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用此選項以儲存查詢單字的歷史紀錄</translation>
     </message>
     <message>
         <source>Store &amp;history</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存歷史紀錄(&amp;h)</translation>
     </message>
     <message>
         <source>Articles</source>
-        <translation type="unfinished"></translation>
+        <translation>條目</translation>
     </message>
     <message>
         <source>Turn this option on to always expand optional parts of articles</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用此選項以後會打開條目額外的部分</translation>
     </message>
     <message>
         <source>Expand optional &amp;parts</source>
-        <translation type="unfinished"></translation>
+        <translation>展開額外的部分(&amp;p)</translation>
     </message>
     <message>
         <source>Turn this option on if you want to select words by single mouse click</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用此選項後只要按一下滑鼠左鍵就可選擇單字</translation>
     </message>
     <message>
         <source>Select word by single click</source>
-        <translation type="unfinished"></translation>
+        <translation>按一下就選字</translation>
     </message>
     <message>
         <source>Add-on style:</source>
-        <translation type="unfinished"></translation>
+        <translation>擴充風格：</translation>
     </message>
     <message>
         <source>Specify the maximum number of entries to keep in history.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定歷史紀錄的最大條目數量。</translation>
     </message>
     <message>
         <source>Maximum history size:</source>
-        <translation type="unfinished"></translation>
+        <translation>歷史紀錄最大為：</translation>
     </message>
     <message>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
-        <translation type="unfinished"></translation>
+        <translation>多久一次儲存歷史紀錄。如果設定為 0 就代表只在離開時儲存。</translation>
     </message>
     <message>
         <source>Save every</source>
-        <translation type="unfinished"></translation>
+        <translation>每</translation>
     </message>
     <message>
         <source>minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>分鐘儲存一次</translation>
     </message>
     <message>
         <source>Modern</source>
-        <translation type="unfinished"></translation>
+        <translation>現代</translation>
     </message>
     <message>
         <source>Lingoes</source>
-        <translation type="unfinished"></translation>
+        <translation>Lingoes</translation>
     </message>
     <message>
         <source>Lingoes-Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Lingoes-Blue</translation>
     </message>
     <message>
         <source>Play audio files via FFmpeg(libav) and libao</source>
-        <translation type="unfinished"></translation>
+        <translation>使用 FFmpeg(libav) 和 libao 播放音訊檔案。</translation>
     </message>
     <message>
         <source>Use internal player</source>
-        <translation type="unfinished"></translation>
+        <translation>使用內部播放器</translation>
     </message>
     <message>
         <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
-        <translation type="unfinished"></translation>
+        <translation>有些網站會偵測 GoldenDict 的HTTP 標頭檔，所以阻擋其請求。
+啟用此選項能應付此問題。</translation>
     </message>
     <message>
         <source>Do not identify GoldenDict in HTTP headers</source>
-        <translation type="unfinished"></translation>
+        <translation>在 HTTP 標頭檔中不要顯示 GoldenDict</translation>
     </message>
     <message>
         <source>Select this option to automatic collapse big articles</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用此選項能自動收縮較長的條目</translation>
     </message>
     <message>
         <source>Collapse articles more than</source>
-        <translation type="unfinished"></translation>
+        <translation>收縮超過</translation>
     </message>
     <message>
         <source>symbols</source>
-        <translation type="unfinished"></translation>
+        <translation>個符號的條目</translation>
     </message>
     <message>
         <source>Adjust this value to avoid huge context menus.</source>
-        <translation type="unfinished"></translation>
+        <translation>調整此數值來避免超長的字典選單。</translation>
     </message>
     <message>
         <source>Context menu dictionaries limit:</source>
-        <translation type="unfinished"></translation>
+        <translation>內文選單的字典上限：</translation>
     </message>
     <message>
         <source>Articles longer than this size will be collapsed</source>
+        <translation>超過此大小的條目將被收縮</translation>
+    </message>
+    <message>
+        <source>System proxy</source>
+        <translation>系統的代理伺服器</translation>
+    </message>
+    <message>
+        <source>Custom proxy</source>
+        <translation>自訂代理伺服器</translation>
+    </message>
+    <message>
+        <source>Custom settings</source>
+        <translation>自訂設定</translation>
+    </message>
+    <message>
+        <source>Full-text search</source>
+        <translation>全文搜尋</translation>
+    </message>
+    <message>
+        <source>Allow full-text search for:</source>
+        <translation>允許下列的全文搜尋：</translation>
+    </message>
+    <message>
+        <source>Don&apos;t search in dictionaries containing more than</source>
+        <translation>不要在超過</translation>
+    </message>
+    <message>
+        <source>articles (0 - unlimited)</source>
+        <translation>條項目的字典中尋找(0 - 不限)</translation>
+    </message>
+    <message>
+        <source>Help language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2738,170 +3166,170 @@
     <name>ProgramTypeEditor</name>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>音訊</translation>
     </message>
     <message>
         <source>Plain Text</source>
-        <translation type="unfinished"></translation>
+        <translation>純文字</translation>
     </message>
     <message>
         <source>Html</source>
-        <translation type="unfinished"></translation>
+        <translation>Html</translation>
     </message>
     <message>
         <source>Prefix Match</source>
-        <translation type="unfinished"></translation>
+        <translation>前綴符合</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>未知</translation>
     </message>
 </context>
 <context>
     <name>Programs::RunInstance</name>
     <message>
         <source>No program name was given.</source>
-        <translation type="unfinished"></translation>
+        <translation>未提供程式名稱。</translation>
     </message>
     <message>
         <source>The program has crashed.</source>
-        <translation type="unfinished"></translation>
+        <translation>該程式已當掉。</translation>
     </message>
     <message>
         <source>The program has returned exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>該程式 returned exit code %1。</translation>
     </message>
 </context>
 <context>
     <name>ProgramsModel</name>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished">已啟用</translation>
+        <translation>已啟用</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>類型</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">名稱</translation>
+        <translation>名稱</translation>
     </message>
     <message>
         <source>Command Line</source>
-        <translation type="unfinished"></translation>
+        <translation>命令列</translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>圖示</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Article loading error</source>
-        <translation type="unfinished"></translation>
+        <translation>條目讀取失敗</translation>
     </message>
     <message>
         <source>Article decoding error</source>
-        <translation type="unfinished"></translation>
+        <translation>條目解碼失敗</translation>
     </message>
     <message>
         <source>avformat_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>avformat_alloc_context() failed.</translation>
     </message>
     <message>
         <source>av_malloc() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>av_malloc() failed.</translation>
     </message>
     <message>
         <source>avio_alloc_context() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>avio_alloc_context() failed.</translation>
     </message>
     <message>
         <source>avformat_open_input() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>avformat_open_input() failed: %1.</translation>
     </message>
     <message>
         <source>avformat_find_stream_info() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>avformat_find_stream_info() failed: %1.</translation>
     </message>
     <message>
         <source>Could not find audio stream.</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到音訊串流。</translation>
     </message>
     <message>
         <source>Codec [id: %1] not found.</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到 Codec [id: %1]</translation>
     </message>
     <message>
         <source>avcodec_open2() failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>avcodec_open2() failed: %1.</translation>
     </message>
     <message>
         <source>Cannot find usable audio output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到可用的音訊輸出裝置。</translation>
     </message>
     <message>
         <source>Unsupported sample format.</source>
-        <translation type="unfinished"></translation>
+        <translation>不支援的樣本格式。</translation>
     </message>
     <message>
         <source>ao_open_live() failed: </source>
-        <translation type="unfinished"></translation>
+        <translation>ao_open_live() failed: </translation>
     </message>
     <message>
         <source>No driver.</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有驅動程式。</translation>
     </message>
     <message>
         <source>This driver is not a live output device.</source>
-        <translation type="unfinished"></translation>
+        <translation>本驅動程式不是有效的輸出裝置。</translation>
     </message>
     <message>
         <source>A valid option key has an invalid value.</source>
-        <translation type="unfinished"></translation>
+        <translation>A valid option key has an invalid value.</translation>
     </message>
     <message>
         <source>Cannot open the device: %1, channels: %2, rate: %3, bits: %4.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟裝置: %1, 頻道: %2, rate: %3, bits: %4.</translation>
     </message>
     <message>
         <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
+        <translation>未知的錯誤。</translation>
     </message>
     <message>
         <source>avcodec_alloc_frame() failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>avcodec_alloc_frame() failed.</translation>
     </message>
 </context>
 <context>
     <name>QuickFilterLine</name>
     <message>
         <source>Dictionary search/filter (Ctrl+F)</source>
-        <translation type="unfinished"></translation>
+        <translation>字典搜尋/篩選(Ctrl+F)</translation>
     </message>
     <message>
         <source>Quick Search</source>
-        <translation type="unfinished"></translation>
+        <translation>快速搜尋</translation>
     </message>
     <message>
         <source>Clear Search</source>
-        <translation type="unfinished"></translation>
+        <translation>清除搜尋</translation>
     </message>
 </context>
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
         <source>ERROR: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>錯誤： %1</translation>
     </message>
     <message>
         <source>Resource saving error: </source>
-        <translation type="unfinished"></translation>
+        <translation>資源儲存錯誤： </translation>
     </message>
     <message>
         <source>The referenced resource failed to download.</source>
-        <translation type="unfinished">所引用的資源下載失敗。</translation>
+        <translation>所引用的資源下載失敗。</translation>
     </message>
 </context>
 <context>
@@ -2950,11 +3378,11 @@
     </message>
     <message>
         <source>Pronounce Word (Alt+S)</source>
-        <translation>朗讀詞條(Alt+S)</translation>
+        <translation>單字發音(Alt+S)</translation>
     </message>
     <message>
         <source>Shows or hides the dictionary bar</source>
-        <translation>顯示或隱藏詞典欄</translation>
+        <translation>顯示或隱藏字典欄</translation>
     </message>
     <message>
         <source>Use this to pin down the window so it would stay on screen,
@@ -2963,19 +3391,19 @@
     </message>
     <message>
         <source>Send word to main window (Alt+W)</source>
-        <translation type="unfinished"></translation>
+        <translation>將單字傳送到主視窗 (Alt+W)</translation>
     </message>
     <message>
         <source>Alt+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+W</translation>
     </message>
     <message>
         <source>Back</source>
-        <translation type="unfinished">回退</translation>
+        <translation>上一頁</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished">前進</translation>
+        <translation>下一頁</translation>
     </message>
     <message>
         <source>GoldenDict</source>
@@ -2983,7 +3411,7 @@
     </message>
     <message>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
 </context>
 <context>
@@ -2998,7 +3426,7 @@
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>圖示</translation>
     </message>
 </context>
 <context>
@@ -3138,7 +3566,7 @@
     </message>
     <message>
         <source>Paths to search for the dictionary files:</source>
-        <translation>詞典檔案所在資料夾：</translation>
+        <translation>字典檔案所在資料夾：</translation>
     </message>
     <message>
         <source>Confirm removal</source>
@@ -3164,7 +3592,7 @@
 Add appropriate dictionaries to the bottoms
 of the appropriate groups to use them.</source>
         <translation>每個構詞法規則庫都會顯示為獨立的協助
-詞典。拼字檢查和拼字建議需要使用這些
+字典。拼字檢查和拼字建議需要使用這些
 構詞法規則庫，請將其新增至相應群組的
 最下面。</translation>
     </message>
@@ -3239,132 +3667,141 @@
     </message>
     <message>
         <source>Programs</source>
-        <translation type="unfinished"></translation>
+        <translation>程式</translation>
     </message>
     <message>
         <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>將程式&lt;b&gt;%1&lt;/b&gt; 從清單移除？</translation>
     </message>
     <message>
         <source>Belarusian transliteration</source>
-        <translation type="unfinished"></translation>
+        <translation>白俄羅斯文轉寫</translation>
     </message>
     <message>
         <source>Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;here&lt;/a&gt;, or leave blank to use the default one.</source>
-        <translation type="unfinished"></translation>
+        <translation>在&lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;此&lt;/a&gt;取得個人金鑰，或是留白以使用預設值。</translation>
     </message>
     <message>
         <source>Alternatively, use %GD1251% for CP1251, %GDISO1%...%GDISO16% for ISO 8859-1...ISO 8859-16 respectively,
 %GDBIG5% for Big-5, %GDBIG5HKSCS% for Big5-HKSCS, %GDGBK% for GBK and GB18030, %GDSHIFTJIS% for Shift-JIS.</source>
-        <translation type="unfinished"></translation>
+        <translation>此外，CP1251也可使用 %GD1251%， ISO 8859-1...ISO 8859-16 分別可使用 %GDISO1%...%GDISO16%
+Big-5 使用%GDBIG5%，Big5-HKSCS 使用 %GDBIG5HKSCS% ，GBK 和 GB18030 使用 %GDGBK%，Shift-JIS 使用 %GDSHIFTJIS%。</translation>
     </message>
     <message>
         <source>Text to Speech</source>
-        <translation type="unfinished"></translation>
+        <translation>文字轉語音</translation>
     </message>
     <message>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. If such string is not presented, the word will be fed into standard input.</source>
-        <translation type="unfinished"></translation>
+        <translation>可使用任何外部程式。字串 %GDWORD% 代表查詢的單字。若未輸入該字串(即:只輸入程式名而未輸入 %GDWORD%)，則會用查詢的單字當作程式的標準輸入。</translation>
+    </message>
+    <message>
+        <source>DICT servers</source>
+        <translation>Dict 伺服器</translation>
+    </message>
+    <message>
+        <source>DICT servers:</source>
+        <translation>DICT 伺服器</translation>
     </message>
 </context>
 <context>
     <name>StylesComboBox</name>
     <message>
         <source>None</source>
-        <translation type="unfinished">無</translation>
+        <translation>無</translation>
     </message>
 </context>
 <context>
     <name>TextToSpeechSource</name>
     <message>
         <source>Selected voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇音訊引擎：</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>新增(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished">移除(&amp;R)</translation>
+        <translation>移除(&amp;R)</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>預覽</translation>
     </message>
     <message>
         <source>Available voice engines:</source>
-        <translation type="unfinished"></translation>
+        <translation>可用的音訊引擎：</translation>
     </message>
     <message>
         <source>Text to be previewed:</source>
-        <translation type="unfinished"></translation>
+        <translation>預覽的文字：</translation>
     </message>
     <message>
         <source>Type text to be previewed here.</source>
-        <translation type="unfinished"></translation>
+        <translation>請在此輸入預覽的文字。</translation>
     </message>
     <message>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>預覽(&amp;P)</translation>
     </message>
     <message>
         <source>No TTS voice available</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有可用的文字轉語音聲音</translation>
     </message>
     <message>
         <source>Confirm removal</source>
-        <translation type="unfinished">確認移除</translation>
+        <translation>確認移除</translation>
     </message>
     <message>
         <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>確定要將&lt;b&gt;%1&lt;/b&gt;音訊引擎從清單中移除嗎？</translation>
     </message>
     <message>
         <source>Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到可用的文字轉語音聲音。&lt;br&gt;請檢查您的電腦是否已經安裝文字轉語音引擎。</translation>
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished">選項</translation>
+        <translation>偏好設定</translation>
     </message>
     <message>
         <source>Volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>音量：</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>速度：</translation>
     </message>
 </context>
 <context>
     <name>TranslateBox</name>
     <message>
         <source>Type a word or phrase to search dictionaries</source>
-        <translation type="unfinished"></translation>
+        <translation>輸入單字或片語來查字典</translation>
     </message>
     <message>
         <source>Drop-down</source>
-        <translation type="unfinished"></translation>
+        <translation>下拉</translation>
     </message>
 </context>
 <context>
     <name>VoiceEnginesModel</name>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished">已啟用</translation>
+        <translation>已啟用</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">名稱</translation>
+        <translation>名稱</translation>
     </message>
     <message>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation>Id</translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>圖示</translation>
     </message>
 </context>
 <context>
@@ -3383,21 +3820,21 @@
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>圖示</translation>
     </message>
 </context>
 <context>
     <name>WordFinder</name>
     <message>
         <source>Failed to query some dictionaries.</source>
-        <translation>在某些詞典中進行查詢時失敗。</translation>
+        <translation>在某些字典中進行查詢時失敗。</translation>
     </message>
 </context>
 <context>
     <name>WordList</name>
     <message>
         <source>WARNING: %1</source>
-        <translation type="unfinished">警告： %1</translation>
+        <translation>警告： %1</translation>
     </message>
 </context>
 </TS>
diff -Nru goldendict-1.5.0~git20131003/lsa.cc goldendict-1.5.0~git20150923/lsa.cc
--- goldendict-1.5.0~git20131003/lsa.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/lsa.cc	2015-09-23 08:26:24.000000000 +0000
@@ -9,7 +9,7 @@
 #include "btreeidx.hh"
 #include "fsencoding.hh"
 #include "audiolink.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 #include <set>
 #include <string>
@@ -24,6 +24,7 @@
 #include <QUrl>
 #include <QDir>
 #include <QDebug>
+#include <QFile>
 
 namespace Lsa {
 
@@ -316,10 +317,10 @@
 /// This wraps around file operations
 struct ShiftedVorbis
 {
-  FILE * f;
+  QFile & f;
   size_t shift;
 
-  ShiftedVorbis( FILE * f_, size_t shift_ ): f( f_ ), shift( shift_ )
+  ShiftedVorbis( QFile & f_, size_t shift_ ): f( f_ ), shift( shift_ )
   {}
 
   static size_t read( void * ptr, size_t size, size_t nmemb, void * datasource );
@@ -334,7 +335,7 @@
 {
   ShiftedVorbis * sv = ( ShiftedVorbis * ) datasource;
 
-  return fread( ptr, size, nmemb, sv->f );
+  return sv->f.read( reinterpret_cast<char *>( ptr ), size * nmemb );
 }
 
 int ShiftedVorbis::seek( void * datasource, ogg_int64_t offset, int whence )
@@ -344,13 +345,19 @@
   if ( whence == SEEK_SET )
     offset += sv->shift;
 
-  return fseek( sv->f, offset, whence );
+  if( whence == SEEK_CUR )
+    offset += sv->f.pos();
+
+  if( whence == SEEK_END )
+    offset += sv->f.size();
+
+  return sv->f.seek( offset );
 }
 
 long ShiftedVorbis::tell( void * datasource )
 {
   ShiftedVorbis * sv = ( ShiftedVorbis * ) datasource;
-  long result = ftell( sv->f );
+  long result = sv->f.pos();
 
   if ( result != -1 )
     result -= sv->shift;
@@ -470,7 +477,7 @@
 
     if ( result > left )
     {
-      FDPRINTF( stderr, "Warning: Vorbis decode returned more data than requested.\n" );
+      GD_FDPRINTF( stderr, "Warning: Vorbis decode returned more data than requested.\n" );
 
       result = left;
     }
@@ -548,7 +555,7 @@
       {
         // Building the index
 
-        qDebug( "Lsa: Building the index for dictionary: %s\n", i->c_str() );
+        gdDebug( "Lsa: Building the index for dictionary: %s\n", i->c_str() );
 
         initializing.indexingDictionary( FsEncoding::basename( *i ) );
 
@@ -568,7 +575,7 @@
         /// XXX handle big-endian machines here!
         uint32_t entriesCount = f.read< uint32_t >();
 
-        DPRINTF( "%s: %u entries\n", i->c_str(), entriesCount );
+        GD_DPRINTF( "%s: %u entries\n", i->c_str(), entriesCount );
 
         idxHeader.soundsCount = entriesCount;
 
@@ -584,7 +591,7 @@
           // Remove the extension, no need for that in the index
           e.name = stripExtension( e.name );
 
-          DPRINTF( "Read filename %s (%u at %u)<\n", e.name.c_str(), e.samplesLength, e.samplesOffset );
+          GD_DPRINTF( "Read filename %s (%u at %u)<\n", e.name.c_str(), e.samplesLength, e.samplesOffset );
 
           // Insert new entry into an index
 
@@ -625,7 +632,7 @@
     }
     catch( std::exception & e )
     {
-      qWarning( "Lingvo's LSA reading failed: %s, error: %s\n",
+      gdWarning( "Lingvo's LSA reading failed: %s, error: %s\n",
                  i->c_str(), e.what() );
     }
   }
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/appendix.h goldendict-1.5.0~git20150923/maclibs/include/eb/appendix.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/appendix.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/appendix.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,100 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_APPENDIX_H
+#define EB_APPENDIX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "eb.h"
+#else
+#include <eb/eb.h>
+#endif
+
+/*
+ * Function declarations.
+ */
+/* appendix.c */
+void eb_initialize_appendix(EB_Appendix *appendix);
+void eb_finalize_appendix(EB_Appendix *appendix);
+EB_Error_Code eb_bind_appendix(EB_Appendix *appendix, const char *path);
+int eb_is_appendix_bound(EB_Appendix *appendix);
+EB_Error_Code eb_appendix_path(EB_Appendix *appendix, char *path);
+
+/* appsub.c */
+EB_Error_Code eb_load_all_appendix_subbooks(EB_Appendix *appendix);
+EB_Error_Code eb_appendix_subbook_list(EB_Appendix *appendix,
+    EB_Subbook_Code *subbook_list, int *subbook_count);
+EB_Error_Code eb_appendix_subbook(EB_Appendix *appendix,
+    EB_Subbook_Code *subbook_code);
+EB_Error_Code eb_appendix_subbook_directory(EB_Appendix *appendix,
+    char *directory);
+EB_Error_Code eb_appendix_subbook_directory2(EB_Appendix *appendix,
+    EB_Subbook_Code subbook_code, char *directory);
+EB_Error_Code eb_set_appendix_subbook(EB_Appendix *appendix,
+    EB_Subbook_Code subbook_code);
+void eb_unset_appendix_subbook(EB_Appendix *appendix);
+
+/* narwalt.c */
+int eb_have_narrow_alt(EB_Appendix *appendix);
+EB_Error_Code eb_narrow_alt_start(EB_Appendix *appendix, int *start);
+EB_Error_Code eb_narrow_alt_end(EB_Appendix *appendix, int *end);
+EB_Error_Code eb_narrow_alt_character_text(EB_Appendix *appendix,
+    int character_number, char *text);
+EB_Error_Code eb_forward_narrow_alt_character(EB_Appendix *appendix,
+    int n, int *character_number);
+EB_Error_Code eb_backward_narrow_alt_character(EB_Appendix *appendix,
+    int n, int *character_number);
+
+/* stopcode.c */
+int eb_have_stop_code(EB_Appendix *appendix);
+EB_Error_Code eb_stop_code(EB_Appendix *appendix, int *);
+
+/* widealt.c */
+int eb_have_wide_alt(EB_Appendix *appendix);
+EB_Error_Code eb_wide_alt_start(EB_Appendix *appendix, int *start);
+EB_Error_Code eb_wide_alt_end(EB_Appendix *appendix, int *end);
+EB_Error_Code eb_wide_alt_character_text(EB_Appendix *appendix,
+    int character_number, char *text);
+EB_Error_Code eb_forward_wide_alt_character(EB_Appendix *appendix, int n,
+    int *character_number);
+EB_Error_Code eb_backward_wide_alt_character(EB_Appendix *appendix, int n,
+    int *character_number);
+
+/* for backward compatibility */
+#define eb_suspend_appendix eb_unset_appendix_subbook
+#define eb_initialize_all_appendix_subbooks eb_load_all_appendix_subbooks
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_APPENDIX_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/binary.h goldendict-1.5.0~git20150923/maclibs/include/eb/binary.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/binary.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/binary.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,73 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 2001-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_BINARY_H
+#define EB_BINARY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Function declarations.
+ */
+/* binary.c */
+EB_Error_Code eb_set_binary_mono_graphic(EB_Book *book,
+    const EB_Position *position, int width, int height);
+EB_Error_Code eb_set_binary_gray_graphic(EB_Book *book,
+    const EB_Position *position, int width, int height);
+EB_Error_Code eb_set_binary_wave(EB_Book *book,
+    const EB_Position *start_position, const EB_Position *end_position);
+EB_Error_Code eb_set_binary_color_graphic(EB_Book *book,
+    const EB_Position *position);
+EB_Error_Code eb_set_binary_mpeg(EB_Book *book, const unsigned int *argv);
+EB_Error_Code eb_read_binary(EB_Book *book, size_t binary_max_length,
+    char *binary, ssize_t *binary_length);
+void eb_unset_binary(EB_Book *book);
+
+/* filename.c */
+EB_Error_Code eb_compose_movie_file_name(const unsigned int *argv,
+    char *composed_file_name);
+EB_Error_Code eb_compose_movie_path_name(EB_Book *book,
+    const unsigned int *argv, char *composed_path_name);
+EB_Error_Code eb_decompose_movie_file_name(unsigned int *argv,
+    const char *composed_file_name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_BINARY_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/booklist.h goldendict-1.5.0~git20150923/maclibs/include/eb/booklist.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/booklist.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/booklist.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,60 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_BOOKLIST_H
+#define EB_BOOKLIST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "eb.h"
+#else
+#include <eb/eb.h>
+#endif
+
+/*
+ * Function declarations.
+ */
+/* booklist.c */
+void eb_initialize_booklist(EB_BookList *booklist);
+void eb_finalize_booklist(EB_BookList *booklist);
+EB_Error_Code eb_bind_booklist(EB_BookList *booklist, const char *path);
+EB_Error_Code eb_booklist_book_count(EB_BookList *booklist, int *book_count);
+EB_Error_Code eb_booklist_book_name(EB_BookList *booklist, int book_index,
+    char **book_name);
+EB_Error_Code eb_booklist_book_title(EB_BookList *booklist, int book_index,
+    char **book_title);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_BOOKLIST_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/defs.h goldendict-1.5.0~git20150923/maclibs/include/eb/defs.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/defs.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/defs.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,1040 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_DEFS_H
+#define EB_DEFS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+#include <limits.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "sysdefs.h"
+#include "zio.h"
+#else
+#include <eb/sysdefs.h>
+#include <eb/zio.h>
+#endif
+
+#ifdef EB_ENABLE_PTHREAD
+#include <pthread.h>
+#endif
+
+/*
+ * Disc code
+ */
+#define EB_DISC_EB			0
+#define EB_DISC_EPWING			1
+#define EB_DISC_INVALID			-1
+
+/*
+ * Character codes.
+ */
+#define EB_CHARCODE_ISO8859_1		1
+#define EB_CHARCODE_JISX0208		2
+#define EB_CHARCODE_JISX0208_GB2312	3
+#define EB_CHARCODE_INVALID		-1
+
+/*
+ * Special book ID for cache to represent "no cache data for any book".
+ */
+#define EB_BOOK_NONE			-1
+
+/*
+ * Special disc code, subbook code, multi search ID, and multi search
+ * entry ID, for representing error state.
+ */
+#define EB_SUBBOOK_INVALID		-1
+#define EB_MULTI_INVALID		-1
+
+/*
+ * Size of a page (The term `page' means `block' in JIS X 4081).
+ */
+#define EB_SIZE_PAGE			2048
+
+/*
+ * Maximum length of a word to be searched.
+ */
+#define EB_MAX_WORD_LENGTH             255
+
+/*
+ * Maximum length of an EB* book title.
+ */
+#define EB_MAX_EB_TITLE_LENGTH		30
+
+/*
+ * Maximum length of an EPWING book title.
+ */
+#define EB_MAX_EPWING_TITLE_LENGTH	80
+
+/*
+ * Maximum length of a book title.
+ */
+#define EB_MAX_TITLE_LENGTH		80
+
+/*
+ * Maximum length of a word to be searched.
+ */
+#if defined(PATH_MAX)
+#define EB_MAX_PATH_LENGTH		PATH_MAX
+#elif defined(MAXPATHLEN)
+#define EB_MAX_PATH_LENGTH		MAXPATHLEN
+#else
+#define EB_MAX_PATH_LENGTH		1024
+#endif
+
+/*
+ * Maximum length of a directory name.
+ */
+#define EB_MAX_DIRECTORY_NAME_LENGTH	8
+
+/*
+ * Maximum length of a file name under a certain directory.
+ * prefix(8 chars) + '.' + suffix(3 chars) + ';' + digit(1 char)
+ */
+#define EB_MAX_FILE_NAME_LENGTH		14
+
+/*
+ * Maximum length of a label for multi-search entry.
+ */
+#define EB_MAX_MULTI_LABEL_LENGTH	30
+
+/*
+ * Maximum length of alternation text string for a private character.
+ */
+#define EB_MAX_ALTERNATION_TEXT_LENGTH	31
+
+/*
+ * Maximum length of title for multi search.
+ */
+#define EB_MAX_MULTI_TITLE_LENGTH	32
+
+/*
+ * Maximum number of font heights in a subbok.
+ */
+#define EB_MAX_FONTS			4
+
+/*
+ * Maximum number of subbooks in a book.
+ */
+#define EB_MAX_SUBBOOKS			50
+
+/*
+ * Maximum number of multi-search types in a subbook.
+ */
+#define EB_MAX_MULTI_SEARCHES		10
+
+/*
+ * Maximum number of entries in a multi-search.
+ */
+#define EB_MAX_MULTI_ENTRIES		5
+
+/*
+ * Maximum number of entries in a keyword search.
+ */
+#define EB_MAX_KEYWORDS			EB_MAX_MULTI_ENTRIES
+
+/*
+ * Maximum number of entries in a cross search.
+ */
+#define EB_MAX_CROSS_ENTRIES		EB_MAX_MULTI_ENTRIES
+
+/*
+ * Maximum number of characters for alternation cache.
+ */
+#define EB_MAX_ALTERNATION_CACHE	16
+
+/*
+ * The number of text hooks.
+ */
+#define EB_NUMBER_OF_HOOKS		54
+
+/*
+ * The number of search contexts required by a book.
+ */
+#define EB_NUMBER_OF_SEARCH_CONTEXTS	EB_MAX_MULTI_ENTRIES
+
+/*
+ * Types for various codes.
+ */
+typedef int EB_Error_Code;
+typedef int EB_Book_Code;
+typedef int EB_Disc_Code;
+typedef int EB_Case_Code;
+typedef int EB_Suffix_Code;
+typedef int EB_Character_Code;
+typedef int EB_Font_Code;
+typedef int EB_Word_Code;
+typedef int EB_Subbook_Code;
+typedef int EB_Index_Style_Code;
+typedef int EB_Search_Code;
+typedef int EB_Text_Code;
+typedef int EB_Text_Status_Code;
+typedef int EB_Multi_Search_Code;
+typedef int EB_Hook_Code;
+typedef int EB_Binary_Code;
+
+/*
+ * Typedef for Structures.
+ */
+#ifdef EB_ENABLE_PTHREAD
+typedef struct EB_Lock_Struct              EB_Lock;
+#endif
+typedef struct EB_Position_Struct          EB_Position;
+typedef struct EB_Alternation_Cache_Struct EB_Alternation_Cache;
+typedef struct EB_Appendix_Subbook_Struct  EB_Appendix_Subbook;
+typedef struct EB_Appendix_Struct          EB_Appendix;
+typedef struct EB_Font_Struct              EB_Font;
+typedef struct EB_Search_Struct            EB_Search;
+typedef struct EB_Multi_Search_Struct      EB_Multi_Search;
+typedef struct EB_Subbook_Struct           EB_Subbook;
+typedef struct EB_Text_Context_Struct      EB_Text_Context;
+typedef struct EB_Binary_Context_Struct    EB_Binary_Context;
+typedef struct EB_Search_Context_Struct    EB_Search_Context;
+typedef struct EB_Book_Struct              EB_Book;
+typedef struct EB_Hit_Struct               EB_Hit;
+typedef struct EB_Hook_Struct              EB_Hook;
+typedef struct EB_Hookset_Struct           EB_Hookset;
+typedef struct EB_BookList_Entry           EB_BookList_Entry;
+typedef struct EB_BookList                 EB_BookList;
+
+/*
+ * Pthreads lock.
+ */
+#ifdef EB_ENABLE_PTHREAD
+struct EB_Lock_Struct {
+    /*
+     * Lock count.  (For emulating recursive lock).
+     */
+    int lock_count;
+
+    /*
+     * Mutex for `lock_count'.
+     */
+    pthread_mutex_t lock_count_mutex;
+
+    /*
+     * Mutex for struct entity.
+     */
+    pthread_mutex_t entity_mutex;
+};
+#endif /* EB_ENABLE_PTHREAD */
+
+/*
+ * A pair of page and offset.
+ */
+struct EB_Position_Struct {
+    /*
+     * Page. (1, 2, 3 ...)
+     */
+    int page;
+
+    /*
+     * Offset in `page'. (0 ... 2047)
+     */
+    int offset;
+};
+
+/*
+ * Chace of aternation text.
+ */
+struct EB_Alternation_Cache_Struct {
+    /*
+     * Character number.
+     */
+    int character_number;
+
+    /*
+     * Alternation string for `char_no'.
+     */
+    char text[EB_MAX_ALTERNATION_TEXT_LENGTH + 1];
+};
+
+/*
+ * An appendix for a subbook.
+ */
+struct EB_Appendix_Subbook_Struct {
+
+    /*
+     * Initialization flag.
+     */
+    int initialized;
+
+    /*
+     * Subbook ID.
+     */
+    EB_Subbook_Code code;
+
+    /*
+     * Directory name.
+     */
+    char directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * Sub-directory name. (EPWING only)
+     */
+    char data_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * File name.
+     */
+    char file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+
+    /*
+     * Character code of the book.
+     */
+    EB_Character_Code character_code;
+
+    /*
+     * Start character number of the narrow/wide font.
+     */
+    int narrow_start;
+    int wide_start;
+
+    /*
+     * End character number of the narrow/wide font.
+     */
+    int narrow_end;
+    int wide_end;
+
+    /*
+     * Start page number of the narrow/wide font.
+     */
+    int narrow_page;
+    int wide_page;
+
+    /*
+     * Stop code (first and second characters).
+     */
+    int stop_code0;
+    int stop_code1;
+
+    /*
+     * Compression Information for appendix file.
+     */
+    Zio zio;
+};
+
+/*
+ * Additional resources for a book.
+ */
+struct EB_Appendix_Struct {
+    /*
+     * Book ID.
+     */
+    EB_Book_Code code;
+
+    /*
+     * Path of the book.
+     */
+    char *path;
+
+    /*
+     * The length of the path.
+     */
+    size_t path_length;
+
+    /*
+     * Disc type.  EB (EB/EBG/EBXA/EBXA-C/S-EBXA) or EPWING.
+     */
+    EB_Disc_Code disc_code;
+
+    /*
+     * The number of subbooks the book has.
+     */
+    int subbook_count;
+
+    /*
+     * Subbook list.
+     */
+    EB_Appendix_Subbook *subbooks;
+
+    /*
+     * Current subbook.
+     */
+    EB_Appendix_Subbook *subbook_current;
+
+    /*
+     * ebnet socket file. 
+     */
+#ifdef EB_ENABLE_EBNET
+    int ebnet_file;
+#endif
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+
+    /*
+     * Cache table for alternation text.
+     */
+    EB_Alternation_Cache narrow_cache[EB_MAX_ALTERNATION_CACHE];
+    EB_Alternation_Cache wide_cache[EB_MAX_ALTERNATION_CACHE];
+};
+
+/*
+ * A font in a subbook.
+ */
+struct EB_Font_Struct {
+    /*
+     * Font Code.
+     * This font is not available, if the code is EB_FONT_INVALID.
+     */
+    EB_Font_Code font_code;
+
+    /*
+     * Whether the object has been initialized.
+     */
+    int initialized;
+
+    /*
+     * Character numbers of the start and end of the font.
+     */
+    int start;
+    int end;
+
+    /*
+     * Page number of the start page of the font data.
+     * Used in EB* only. (In EPWING, it is alyways 1).
+     */
+    int page;
+
+    /*
+     * File name of the font. (EPWING only)
+     */
+    char file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+
+    /*
+     * Font data cache.
+     */
+    char *glyphs;
+
+    /*
+     * Compression Information.
+     */
+    Zio zio;
+};
+
+/*
+ * Search methods in a subbook.
+ */
+struct EB_Search_Struct {
+    /*
+     * Index ID.
+     */
+    int index_id;
+
+    /*
+     * Page number of the start page of an index.
+     * This search method is not available, if `start_page' is 0,
+     */
+    int start_page;
+    int end_page;
+
+    /*
+     * Page number of the start page of candidates.
+     * (for multi search entry)
+     */
+    int candidates_page;
+
+    /*
+     * Index style flags.
+     */
+    EB_Index_Style_Code katakana;
+    EB_Index_Style_Code lower;
+    EB_Index_Style_Code mark;
+    EB_Index_Style_Code long_vowel;
+    EB_Index_Style_Code double_consonant;
+    EB_Index_Style_Code contracted_sound;
+    EB_Index_Style_Code voiced_consonant;
+    EB_Index_Style_Code small_vowel;
+    EB_Index_Style_Code p_sound;
+    EB_Index_Style_Code space;
+
+    /*
+     * Label. (for an entry in multi search)
+     */
+    char label[EB_MAX_MULTI_LABEL_LENGTH + 1];
+};
+
+/*
+ * A multi-search entry in a subbook.
+ */
+struct EB_Multi_Search_Struct {
+    /*
+     * Search method information.
+     */
+    EB_Search search;
+
+    /*
+     * Search title. (EPWING only)
+     */
+    char title[EB_MAX_MULTI_TITLE_LENGTH + 1];
+
+    /*
+     * The number of entries the multi search has.
+     */
+    int entry_count;
+
+    /*
+     * List of Word entry information.
+     */
+    EB_Search entries[EB_MAX_MULTI_ENTRIES];
+};
+
+/*
+ * A subbook in a book.
+ */
+struct EB_Subbook_Struct {
+    /*
+     * Whether the object has been initialized.
+     */
+    int initialized;
+
+    /*
+     * Index page.
+     */
+    int index_page;
+
+    /*
+     * Subbook ID.
+     * This subbook is not available, if the code is EB_SUBBOOK_INVALID.
+     */
+    EB_Subbook_Code code;
+
+    /*
+     * File descriptor and compression information for text file.
+     */
+    Zio text_zio;
+
+    /*
+     * File descriptor and compression information for graphic file.
+     */
+    Zio graphic_zio;
+
+    /*
+     * File descriptor and compression information for sound file.
+     */
+    Zio sound_zio;
+
+    /*
+     * File descriptor and compression information for movie file.
+     */
+    Zio movie_zio;
+
+    /*
+     * Title of the subbook.
+     */
+    char title[EB_MAX_TITLE_LENGTH + 1];
+
+    /*
+     * Subbook directory name.
+     */
+    char directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * Sub-directory names. (EPWING only)
+     */
+    char data_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+    char gaiji_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+    char movie_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * File names.
+     */
+    char text_file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+    char graphic_file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+    char sound_file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+
+    /*
+     * Compression hints of Text, graphic and sound files.
+     * (temporary need, EPWING only).
+     */
+    Zio_Code text_hint_zio_code;
+    Zio_Code graphic_hint_zio_code;
+    Zio_Code sound_hint_zio_code;
+
+    /*
+     * Page number where search method titles are stored.
+     * (temporary need, EPWING only).
+     */
+    int search_title_page;
+
+    /*
+     * The top page of search methods.
+     */
+    EB_Search word_alphabet;
+    EB_Search word_asis;
+    EB_Search word_kana;
+    EB_Search endword_alphabet;
+    EB_Search endword_asis;
+    EB_Search endword_kana;
+    EB_Search keyword;
+    EB_Search menu;
+    EB_Search image_menu;
+    EB_Search cross;
+    EB_Search copyright;
+    EB_Search text;
+    EB_Search sound;
+
+    /*
+     * The number of multi-search methods the subbook has.
+     */
+    int multi_count;
+
+    /*
+     * The top page of multi search methods.
+     */
+    EB_Multi_Search multis[EB_MAX_MULTI_SEARCHES];
+
+    /*
+     * Font list.
+     */
+    EB_Font narrow_fonts[EB_MAX_FONTS];
+    EB_Font wide_fonts[EB_MAX_FONTS];
+
+    /*
+     * Current narrow and wide fonts.
+     */
+    EB_Font *narrow_current;
+    EB_Font *wide_current;
+};
+
+/*
+ * Length of cache buffer in a binary context.
+ * It must be greater than 38, size of GIF preamble.
+ * It must be greater than 44, size of WAVE sound header.
+ * It must be greater than 118, size of BMP header + info + 16 rgbquads.
+ */
+#define EB_SIZE_BINARY_CACHE_BUFFER	128
+
+/*
+ * Context parameters for binary data.
+ */
+struct EB_Binary_Context_Struct {
+    /*
+     * Binary type ID.
+     * The context is not active, if this code is EB_BINARY_INVALID.
+     */
+    EB_Binary_Code code;
+
+    /*
+     * Compress information.
+     */
+    Zio *zio;
+
+    /*
+     * Location of the the binary data, relative to the start of the file.
+     */
+    off_t location;
+
+    /*
+     * Data size.
+     * Size zero means that the binary has no size information.
+     */
+    size_t size;
+
+    /*
+     * The current offset of binary data.
+     */
+    size_t offset;
+
+    /*
+     * Cache buffer.
+     */
+    char cache_buffer[EB_SIZE_BINARY_CACHE_BUFFER];
+
+    /*
+     * Length of cached data.
+     */
+    size_t cache_length;
+
+    /*
+     * Current offset of cached data.
+     */
+    size_t cache_offset;
+
+    /*
+     * Width of Image. (monochrome graphic only)
+     */
+    int width;
+};
+
+/*
+ * Context parameters for text reading.
+ */
+struct EB_Text_Context_Struct {
+    /*
+     * Current text content type.
+     * The context is not active, if this code is EB_TEXT_INVALID.
+     */
+    EB_Text_Code code;
+
+    /*
+     * Current offset pointer of the START or HONMON file.
+     */
+    off_t location;
+
+    /*
+     * The current point of a buffer on which text is written.
+     */
+    char *out;
+
+    /*
+     * Length of `out'.
+     */
+    size_t out_rest_length;
+    
+    /*
+     * Unprocessed string that a hook function writes on text.
+     */
+    char *unprocessed;
+
+    /*
+     * Size of `unprocessed'.
+     */
+    size_t unprocessed_size;
+
+    /*
+     * Length of the current output text phrase.
+     */
+    size_t out_step;
+
+    /*
+     * Narrow character region flag.
+     */
+    int narrow_flag;
+
+    /*
+     * Whether a printable character has been appeared in the current
+     * text content.
+     */
+    int printable_count;
+
+    /* 
+     * EOF flag of the current subbook.
+     */
+    int file_end_flag;
+
+    /*
+     * Status of the current text processing.
+     */
+    EB_Text_Status_Code text_status;
+
+    /*
+     * Skip until `skipcode' appears.
+     */
+    int skip_code;
+
+    /*
+     * Stop-code automatically set by EB Library.
+     */
+    int auto_stop_code;
+
+    /*
+     * The current candidate word for multi search.
+     */
+    char candidate[EB_MAX_WORD_LENGTH + 1];
+
+    /*
+     * Whether the current text point is in the candidate word or not.
+     */
+    int is_candidate;
+
+    /*
+     * Whether the current text point is in EBXA-C gaiji area.
+     */
+    int ebxac_gaiji_flag;
+};
+
+/*
+ * Context parameters for word search.
+ */
+struct EB_Search_Context_Struct {
+    /*
+     * Current search method type.
+     * The context is not active, if this code is EB_SEARCH_NONE.
+     */
+    EB_Search_Code code;
+
+    /*
+     * Function which compares word to search and pattern in an index page.
+     */
+    int (*compare_pre)(const char *word, const char *pattern,
+	size_t length);
+    int (*compare_single)(const char *word, const char *pattern,
+	size_t length);
+    int (*compare_group)(const char *word, const char *pattern,
+	size_t length);
+
+    /*
+     * Result of comparison by `compare'.
+     */
+    int comparison_result;
+
+    /*
+     * Word to search.
+     */
+    char word[EB_MAX_WORD_LENGTH + 1];
+
+    /*
+     * Canonicalized word to search.
+     */
+    char canonicalized_word[EB_MAX_WORD_LENGTH + 1];
+
+    /*
+     * Page which is searched currently.
+     */
+    int page;
+
+    /*
+     * Offset which is searched currently in the page.
+     */
+    int offset;
+
+    /*
+     * Page ID of the current page.
+     */
+    int page_id;
+
+    /*
+     * How many entries in the current page.
+     */
+    int entry_count;
+
+    /*
+     * Entry index pointer.
+     */
+    int entry_index;
+
+    /*
+     * Length of the current entry.
+     */
+    int entry_length;
+
+    /*
+     * Arrangement style of entries in the current page (fixed or variable).
+     */
+    int entry_arrangement;
+
+    /*
+     * In a group entry or not.
+     */
+    int in_group_entry;
+
+    /*
+     * Current heading position (for keyword search).
+     */
+    EB_Position keyword_heading;
+};
+
+/*
+ * A book.
+ */
+struct EB_Book_Struct {
+    /*
+     * Book ID.
+     */
+    EB_Book_Code code;
+
+    /*
+     * Disc type.  EB* or EPWING.
+     */
+    EB_Disc_Code disc_code;
+
+    /*
+     * Character code of the book.
+     */
+    EB_Character_Code character_code;
+
+    /*
+     * Path of the book.
+     */
+    char *path;
+
+    /*
+     * The length of the path.
+     */
+    size_t path_length;
+
+    /*
+     * The number of subbooks the book has.
+     */
+    int subbook_count;
+
+    /*
+     * Subbook list.
+     */
+    EB_Subbook *subbooks;
+
+    /*
+     * Current subbook.
+     */
+    EB_Subbook *subbook_current;
+
+    /*
+     * Context parameters for text reading.
+     */
+    EB_Text_Context text_context;
+
+    /*
+     * Context parameters for binary reading.
+     */
+    EB_Binary_Context binary_context;
+
+    /*
+     * Context parameters for text reading.
+     */
+    EB_Search_Context search_contexts[EB_NUMBER_OF_SEARCH_CONTEXTS];
+
+    /*
+     * ebnet socket file. 
+     */
+#ifdef EB_ENABLE_EBNET
+    int ebnet_file;
+#endif
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+};
+
+/*
+ * In a word search, heading and text locations of a matched entry
+ * are stored.
+ */
+struct EB_Hit_Struct {
+    /*
+     * Heading position.
+     */
+    EB_Position heading;
+
+    /*
+     * Text position.
+     */
+    EB_Position text;
+};
+
+/*
+ * A text hook.
+ */
+struct EB_Hook_Struct {
+    /*
+     * Hook code.
+     */
+    EB_Hook_Code code;
+
+    /*
+     * Hook function for the hook code `code'.
+     */
+    EB_Error_Code (*function)(EB_Book *book, EB_Appendix *appendix,
+	void *container, EB_Hook_Code hook_code, int argc,
+	const unsigned int *argv);
+};
+
+/*
+ * A set of text hooks.
+ */
+struct EB_Hookset_Struct {
+    /*
+     * List of hooks.
+     */
+    EB_Hook hooks[EB_NUMBER_OF_HOOKS];
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+};
+
+/*
+ * An entry of book list.
+ */
+struct EB_BookList_Entry {
+    /*
+     * name.
+     */
+    char *name;
+
+    /*
+     * Title.
+     */
+    char *title;
+};
+
+/*
+ * Book list.
+ */
+struct EB_BookList {
+    /*
+     * Book List ID.
+     */
+    EB_Book_Code code;
+
+    /*
+     * The number of book entries this list has.
+     */
+    int entry_count;
+
+    /*
+     * The maximum number of book entries that `entries' can memory.
+     */
+    int max_entry_count;
+
+    /*
+     * Book entries.
+     */
+    EB_BookList_Entry *entries;
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+};
+
+/* for backward compatibility */
+#define EB_Multi_Entry_Code int
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_DEFS_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/eb.h goldendict-1.5.0~git20150923/maclibs/include/eb/eb.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/eb.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/eb.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,155 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_EB_H
+#define EB_EB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+#include <stdarg.h>
+
+/*
+ * Function declarations.
+ */
+/* book.c */
+void eb_initialize_book(EB_Book *book);
+EB_Error_Code eb_bind(EB_Book *book, const char *path);
+void eb_finalize_book(EB_Book *book);
+int eb_is_bound(EB_Book *book);
+EB_Error_Code eb_path(EB_Book *book, char *path);
+EB_Error_Code eb_disc_type(EB_Book *book, EB_Disc_Code *disc_code);
+EB_Error_Code eb_character_code(EB_Book *book,
+    EB_Character_Code *character_code);
+
+/* copyright.h */
+int eb_have_copyright(EB_Book *book);
+EB_Error_Code eb_copyright(EB_Book *book, EB_Position *position);
+EB_Error_Code eb_search_cross(EB_Book *book,
+    const char * const input_words[]);
+
+/* cross.c */
+int eb_have_cross_search(EB_Book *book);
+
+/* eb.c */
+EB_Error_Code eb_initialize_library(void);
+void eb_finalize_library(void);
+
+/* endword.c */
+int eb_have_endword_search(EB_Book *book);
+EB_Error_Code eb_search_endword(EB_Book *book, const char *input_word);
+
+/* exactword.c */
+int eb_have_exactword_search(EB_Book *book);
+EB_Error_Code eb_search_exactword(EB_Book *book, const char *input_word);
+
+/* graphic.c */
+int eb_have_graphic_search(EB_Book *book);
+
+/* keyword.c */
+int eb_have_keyword_search(EB_Book *book);
+EB_Error_Code eb_search_keyword(EB_Book *book,
+    const char * const input_words[]);
+
+/* lock.c */
+int eb_pthread_enabled(void);
+
+/* log.c */
+void eb_set_log_function(void (*function)(const char *message, va_list ap));
+void eb_enable_log(void);
+void eb_disable_log(void);
+void eb_log(const char *message, ...);
+void eb_log_stderr(const char *message, va_list ap);
+
+/* menu.c */
+int eb_have_menu(EB_Book *book);
+EB_Error_Code eb_menu(EB_Book *book, EB_Position *position);
+int eb_have_image_menu(EB_Book *book);
+EB_Error_Code eb_image_menu(EB_Book *book, EB_Position *position);
+
+/* multi.c */
+int eb_have_multi_search(EB_Book *book);
+EB_Error_Code eb_multi_title(EB_Book *book, EB_Multi_Search_Code multi_id,
+    char *title);
+EB_Error_Code eb_multi_search_list(EB_Book *book,
+    EB_Multi_Search_Code *search_list, int *search_count);
+EB_Error_Code eb_multi_entry_count(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int *entry_count);
+EB_Error_Code eb_multi_entry_list(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int *entry_list, int *entry_count);
+EB_Error_Code eb_multi_entry_label(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int entry_index, char *label);
+int eb_multi_entry_have_candidates(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int entry_index);
+EB_Error_Code eb_multi_entry_candidates(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int entry_index, EB_Position *position);
+EB_Error_Code eb_search_multi(EB_Book *book, EB_Multi_Search_Code multi_id,
+    const char * const input_words[]);
+
+/* text.c */
+int eb_have_text(EB_Book *book);
+EB_Error_Code eb_text(EB_Book *book, EB_Position *position);
+
+/* search.c */
+EB_Error_Code eb_hit_list(EB_Book *book, int max_hit_count, EB_Hit *hit_list,
+    int *hit_count);
+
+/* subbook.c */
+EB_Error_Code eb_load_all_subbooks(EB_Book *book);
+EB_Error_Code eb_subbook_list(EB_Book *book, EB_Subbook_Code *subbook_list,
+    int *subbook_count);
+EB_Error_Code eb_subbook(EB_Book *book, EB_Subbook_Code *subbook_code);
+EB_Error_Code eb_subbook_title(EB_Book *book, char *title);
+EB_Error_Code eb_subbook_title2(EB_Book *book, EB_Subbook_Code subbook_code,
+    char *title);
+EB_Error_Code eb_subbook_directory(EB_Book *book, char *directory);
+EB_Error_Code eb_subbook_directory2(EB_Book *book,
+    EB_Subbook_Code subbook_code, char *directory);
+EB_Error_Code eb_set_subbook(EB_Book *book, EB_Subbook_Code subbook_code);
+void eb_unset_subbook(EB_Book *book);
+
+/* word.c */
+int eb_have_word_search(EB_Book *book);
+EB_Error_Code eb_search_word(EB_Book *book, const char *input_word);
+
+/* for backward compatibility */
+#define eb_suspend eb_unset_subbook
+#define eb_initialize_all_subbooks eb_load_all_subbooks
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_EB_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/error.h goldendict-1.5.0~git20150923/maclibs/include/eb/error.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/error.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/error.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,150 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_ERROR_H
+#define EB_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Error codes.
+ */
+#define EB_SUCCESS			0
+#define EB_ERR_MEMORY_EXHAUSTED		1
+#define EB_ERR_EMPTY_FILE_NAME		2
+#define EB_ERR_TOO_LONG_FILE_NAME	3
+#define EB_ERR_BAD_FILE_NAME		4
+
+#define EB_ERR_BAD_DIR_NAME		5
+#define EB_ERR_TOO_LONG_WORD		6
+#define EB_ERR_BAD_WORD			7
+#define EB_ERR_EMPTY_WORD		8
+#define EB_ERR_FAIL_GETCWD		9
+
+#define EB_ERR_FAIL_OPEN_CAT		10
+#define EB_ERR_FAIL_OPEN_CATAPP		11
+#define EB_ERR_FAIL_OPEN_TEXT		12
+#define EB_ERR_FAIL_OPEN_FONT		13
+#define EB_ERR_FAIL_OPEN_APP		14
+
+#define EB_ERR_FAIL_OPEN_BINARY		15
+#define EB_ERR_FAIL_READ_CAT		16
+#define EB_ERR_FAIL_READ_CATAPP		17
+#define EB_ERR_FAIL_READ_TEXT		18
+#define EB_ERR_FAIL_READ_FONT		19
+
+#define EB_ERR_FAIL_READ_APP		20
+#define EB_ERR_FAIL_READ_BINARY		21
+#define EB_ERR_FAIL_SEEK_CAT		22
+#define EB_ERR_FAIL_SEEK_CATAPP		23
+#define EB_ERR_FAIL_SEEK_TEXT		24
+
+#define EB_ERR_FAIL_SEEK_FONT		25
+#define EB_ERR_FAIL_SEEK_APP		26
+#define EB_ERR_FAIL_SEEK_BINARY		27
+#define EB_ERR_UNEXP_CAT		28
+#define EB_ERR_UNEXP_CATAPP		29
+
+#define EB_ERR_UNEXP_TEXT		30
+#define EB_ERR_UNEXP_FONT		31
+#define EB_ERR_UNEXP_APP		32
+#define EB_ERR_UNEXP_BINARY		33
+#define EB_ERR_UNBOUND_BOOK		34
+
+#define EB_ERR_UNBOUND_APP		35
+#define EB_ERR_NO_SUB			36
+#define EB_ERR_NO_APPSUB		37
+#define EB_ERR_NO_FONT			38
+#define EB_ERR_NO_TEXT			39
+
+#define EB_ERR_NO_STOPCODE		40
+#define EB_ERR_NO_ALT			41
+#define EB_ERR_NO_CUR_SUB		42
+#define EB_ERR_NO_CUR_APPSUB		43
+#define EB_ERR_NO_CUR_FONT		44
+
+#define EB_ERR_NO_CUR_BINARY		45
+#define EB_ERR_NO_SUCH_SUB		46
+#define EB_ERR_NO_SUCH_APPSUB		47
+#define EB_ERR_NO_SUCH_FONT		48
+#define EB_ERR_NO_SUCH_CHAR_BMP		49
+
+#define EB_ERR_NO_SUCH_CHAR_TEXT	50
+#define EB_ERR_NO_SUCH_SEARCH		51
+#define EB_ERR_NO_SUCH_HOOK		52
+#define EB_ERR_NO_SUCH_BINARY		53
+#define EB_ERR_DIFF_CONTENT		54
+
+#define EB_ERR_NO_PREV_SEARCH		55
+#define EB_ERR_NO_SUCH_MULTI_ID		56
+#define EB_ERR_NO_SUCH_ENTRY_ID		57
+#define EB_ERR_TOO_MANY_WORDS		58
+#define EB_ERR_NO_WORD			59
+
+#define EB_ERR_NO_CANDIDATES		60
+#define EB_ERR_END_OF_CONTENT		61
+#define EB_ERR_NO_PREV_SEEK		62
+#define EB_ERR_EBNET_UNSUPPORTED	63
+#define EB_ERR_EBNET_FAIL_CONNECT	64
+
+#define EB_ERR_EBNET_SERVER_BUSY	65
+#define EB_ERR_EBNET_NO_PERMISSION	66
+#define EB_ERR_UNBOUND_BOOKLIST		67
+#define EB_ERR_NO_SUCH_BOOK		68
+
+
+/*
+ * The number of error codes.
+ */
+#define EB_NUMBER_OF_ERRORS		69
+
+/*
+ * The maximum length of an error message.
+ */
+#define EB_MAX_ERROR_MESSAGE_LENGTH	127
+
+/*
+ * Function declarations.
+ */
+/* error.c */
+const char *eb_error_string(EB_Error_Code error_code);
+const char *eb_error_message(EB_Error_Code error_code);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_ERROR_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/font.h goldendict-1.5.0~git20150923/maclibs/include/eb/font.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/font.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/font.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,200 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_FONT_H
+#define EB_FONT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Font types.
+ */
+#define EB_FONT_16		0
+#define EB_FONT_24		1
+#define EB_FONT_30		2
+#define EB_FONT_48		3
+#define EB_FONT_INVALID		-1
+
+/*
+ * Font sizes.
+ */
+#define EB_SIZE_NARROW_FONT_16		16
+#define EB_SIZE_WIDE_FONT_16		32
+#define EB_SIZE_NARROW_FONT_24		48
+#define EB_SIZE_WIDE_FONT_24		72
+#define EB_SIZE_NARROW_FONT_30		60
+#define EB_SIZE_WIDE_FONT_30		120
+#define EB_SIZE_NARROW_FONT_48		144
+#define EB_SIZE_WIDE_FONT_48		288
+
+/*
+ * Font width.
+ */
+#define EB_WIDTH_NARROW_FONT_16		8
+#define EB_WIDTH_WIDE_FONT_16		16
+#define EB_WIDTH_NARROW_FONT_24		16
+#define EB_WIDTH_WIDE_FONT_24		24
+#define EB_WIDTH_NARROW_FONT_30		16
+#define EB_WIDTH_WIDE_FONT_30		32
+#define EB_WIDTH_NARROW_FONT_48		24
+#define EB_WIDTH_WIDE_FONT_48		48
+
+/*
+ * Font height.
+ */
+#define EB_HEIGHT_FONT_16		16
+#define EB_HEIGHT_FONT_24		24
+#define EB_HEIGHT_FONT_30		30
+#define EB_HEIGHT_FONT_48		48
+
+/*
+ * Bitmap image sizes.
+ */
+#define EB_SIZE_NARROW_FONT_16_XBM		184
+#define EB_SIZE_WIDE_FONT_16_XBM		284
+#define EB_SIZE_NARROW_FONT_16_XPM		266
+#define EB_SIZE_WIDE_FONT_16_XPM		395
+#define EB_SIZE_NARROW_FONT_16_GIF		186
+#define EB_SIZE_WIDE_FONT_16_GIF		314
+#define EB_SIZE_NARROW_FONT_16_BMP		126
+#define EB_SIZE_WIDE_FONT_16_BMP		126
+#define EB_SIZE_NARROW_FONT_16_PNG		131
+#define EB_SIZE_WIDE_FONT_16_PNG		147
+
+#define EB_SIZE_NARROW_FONT_24_XBM		383
+#define EB_SIZE_WIDE_FONT_24_XBM		533
+#define EB_SIZE_NARROW_FONT_24_XPM		555
+#define EB_SIZE_WIDE_FONT_24_XPM		747
+#define EB_SIZE_NARROW_FONT_24_GIF		450
+#define EB_SIZE_WIDE_FONT_24_GIF		642
+#define EB_SIZE_NARROW_FONT_24_BMP		158
+#define EB_SIZE_WIDE_FONT_24_BMP		158
+#define EB_SIZE_NARROW_FONT_24_PNG		171
+#define EB_SIZE_WIDE_FONT_24_PNG		195
+
+#define EB_SIZE_NARROW_FONT_30_XBM		458
+#define EB_SIZE_WIDE_FONT_30_XBM		833
+#define EB_SIZE_NARROW_FONT_30_XPM		675
+#define EB_SIZE_WIDE_FONT_30_XPM		1155
+#define EB_SIZE_NARROW_FONT_30_GIF		552
+#define EB_SIZE_WIDE_FONT_30_GIF		1032
+#define EB_SIZE_NARROW_FONT_30_BMP		182
+#define EB_SIZE_WIDE_FONT_30_BMP		182
+#define EB_SIZE_NARROW_FONT_30_PNG		189
+#define EB_SIZE_WIDE_FONT_30_PNG		249
+
+#define EB_SIZE_NARROW_FONT_48_XBM		983
+#define EB_SIZE_WIDE_FONT_48_XBM		1883
+#define EB_SIZE_NARROW_FONT_48_XPM		1419
+#define EB_SIZE_WIDE_FONT_48_XPM		2571
+#define EB_SIZE_NARROW_FONT_48_GIF		1242
+#define EB_SIZE_WIDE_FONT_48_GIF		2394
+#define EB_SIZE_NARROW_FONT_48_BMP		254
+#define EB_SIZE_WIDE_FONT_48_BMP		446
+#define EB_SIZE_NARROW_FONT_48_PNG		291
+#define EB_SIZE_WIDE_FONT_48_PNG		435
+
+#define EB_SIZE_FONT_IMAGE	EB_SIZE_WIDE_FONT_48_XPM	    
+
+/*
+ * Function declarations.
+ */
+/* bitmap.c */
+EB_Error_Code eb_narrow_font_xbm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_xpm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_gif_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_bmp_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_png_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_xbm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_xpm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_gif_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_bmp_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_png_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_bitmap_to_xbm(const char *bitmap, int width, int height,
+    char *xbm, size_t *xbm_length);
+EB_Error_Code eb_bitmap_to_xpm(const char *bitmap, int width, int height,
+    char *xpm, size_t *xpm_length);
+EB_Error_Code eb_bitmap_to_gif(const char *bitmap, int width, int height,
+    char *gif, size_t *gif_length);
+EB_Error_Code eb_bitmap_to_bmp(const char *bitmap, int width, int height,
+    char *bmp, size_t *bmp_length);
+EB_Error_Code eb_bitmap_to_png(const char *bitmap, int width, int height,
+    char *png, size_t *png_length);
+
+/* font.c */
+EB_Error_Code eb_font(EB_Book *book, EB_Font_Code *font_code);
+EB_Error_Code eb_set_font(EB_Book *book, EB_Font_Code font_code);
+void eb_unset_font(EB_Book *book);
+EB_Error_Code eb_font_list(EB_Book *book, EB_Font_Code *font_list,
+    int *font_count);
+int eb_have_font(EB_Book *book, EB_Font_Code font_code);
+EB_Error_Code eb_font_height(EB_Book *book, int *height);
+EB_Error_Code eb_font_height2(EB_Font_Code font_code, int *height);
+
+/* narwfont.c */
+int eb_have_narrow_font(EB_Book *book);
+EB_Error_Code eb_narrow_font_width(EB_Book *book, int *width);
+EB_Error_Code eb_narrow_font_width2(EB_Font_Code font_code, int *width);
+EB_Error_Code eb_narrow_font_size(EB_Book *book, size_t *size);
+EB_Error_Code eb_narrow_font_size2(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_start(EB_Book *book, int *start);
+EB_Error_Code eb_narrow_font_end(EB_Book *book, int *end);
+EB_Error_Code eb_narrow_font_character_bitmap(EB_Book *book, int, char *);
+EB_Error_Code eb_forward_narrow_font_character(EB_Book *book, int, int *);
+EB_Error_Code eb_backward_narrow_font_character(EB_Book *book, int, int *);
+
+/* widefont.c */
+int eb_have_wide_font(EB_Book *book);
+EB_Error_Code eb_wide_font_width(EB_Book *book, int *width);
+EB_Error_Code eb_wide_font_width2(EB_Font_Code font_code, int *width);
+EB_Error_Code eb_wide_font_size(EB_Book *book, size_t *size);
+EB_Error_Code eb_wide_font_size2(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_start(EB_Book *book, int *start);
+EB_Error_Code eb_wide_font_end(EB_Book *book, int *end);
+EB_Error_Code eb_wide_font_character_bitmap(EB_Book *book,
+    int character_number, char *bitmap);
+EB_Error_Code eb_forward_wide_font_character(EB_Book *book, int n,
+    int *character_number);
+EB_Error_Code eb_backward_wide_font_character(EB_Book *book, int n,
+    int *character_number);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_FONT_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/sysdefs.h goldendict-1.5.0~git20150923/maclibs/include/eb/sysdefs.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/sysdefs.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/sysdefs.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,4 @@
+/* automatically generated by Makefile. */
+#define EB_VERSION_STRING "4.4.3"
+#define EB_VERSION_MAJOR 4
+#define EB_VERSION_MINOR 4
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/text.h goldendict-1.5.0~git20150923/maclibs/include/eb/text.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/text.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/text.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,166 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_TEXT_H
+#define EB_TEXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Hook codes.
+ * (When you add or remove a hook, update EB_NUMER_OF_HOOKS in defs.h.)
+ */
+#define EB_HOOK_NULL			-1
+#define EB_HOOK_INITIALIZE		0
+#define EB_HOOK_BEGIN_NARROW		1
+#define EB_HOOK_END_NARROW		2
+#define EB_HOOK_BEGIN_SUBSCRIPT		3
+#define EB_HOOK_END_SUBSCRIPT		4
+
+#define EB_HOOK_SET_INDENT		5
+#define EB_HOOK_NEWLINE			6
+#define EB_HOOK_BEGIN_SUPERSCRIPT	7
+#define EB_HOOK_END_SUPERSCRIPT		8
+#define EB_HOOK_BEGIN_NO_NEWLINE	9
+
+#define EB_HOOK_END_NO_NEWLINE		10
+#define EB_HOOK_BEGIN_EMPHASIS		11
+#define EB_HOOK_END_EMPHASIS		12
+#define EB_HOOK_BEGIN_CANDIDATE		13
+#define EB_HOOK_END_CANDIDATE_GROUP	14
+
+#define EB_HOOK_END_CANDIDATE_LEAF	15
+#define EB_HOOK_BEGIN_REFERENCE		16
+#define EB_HOOK_END_REFERENCE		17
+#define EB_HOOK_BEGIN_KEYWORD		18
+#define EB_HOOK_END_KEYWORD		19
+
+#define EB_HOOK_NARROW_FONT		20
+#define EB_HOOK_WIDE_FONT		21
+#define EB_HOOK_ISO8859_1		22
+#define EB_HOOK_NARROW_JISX0208		23
+#define EB_HOOK_WIDE_JISX0208		24
+
+#define EB_HOOK_GB2312			25
+#define EB_HOOK_BEGIN_MONO_GRAPHIC	26
+#define EB_HOOK_END_MONO_GRAPHIC	27
+#define EB_HOOK_BEGIN_GRAY_GRAPHIC	28
+#define EB_HOOK_END_GRAY_GRAPHIC	29
+
+#define EB_HOOK_BEGIN_COLOR_BMP		30
+#define EB_HOOK_BEGIN_COLOR_JPEG	31
+#define EB_HOOK_BEGIN_IN_COLOR_BMP	32
+#define EB_HOOK_BEGIN_IN_COLOR_JPEG	33
+#define EB_HOOK_END_COLOR_GRAPHIC	34
+
+#define EB_HOOK_END_IN_COLOR_GRAPHIC	35
+#define EB_HOOK_BEGIN_WAVE		36
+#define EB_HOOK_END_WAVE		37
+#define EB_HOOK_BEGIN_MPEG		38
+#define EB_HOOK_END_MPEG		39
+
+#define EB_HOOK_BEGIN_GRAPHIC_REFERENCE	40
+#define EB_HOOK_END_GRAPHIC_REFERENCE	41
+#define EB_HOOK_GRAPHIC_REFERENCE	42
+#define EB_HOOK_BEGIN_DECORATION	43
+#define EB_HOOK_END_DECORATION		44
+
+#define EB_HOOK_BEGIN_IMAGE_PAGE        45
+#define EB_HOOK_END_IMAGE_PAGE          46
+#define EB_HOOK_BEGIN_CLICKABLE_AREA    47
+#define EB_HOOK_END_CLICKABLE_AREA      48
+
+#define EB_HOOK_BEGIN_UNICODE		49
+#define EB_HOOK_END_UNICODE		50
+#define EB_HOOK_BEGIN_EBXAC_GAIJI	51
+#define EB_HOOK_END_EBXAC_GAIJI		52
+#define EB_HOOK_EBXAC_GAIJI		53
+
+/*
+ * Function declarations.
+ */
+/* hook.c */
+void eb_initialize_hookset(EB_Hookset *hookset);
+void eb_finalize_hookset(EB_Hookset *hookset);
+EB_Error_Code eb_set_hook(EB_Hookset *hookset, const EB_Hook *hook);
+EB_Error_Code eb_set_hooks(EB_Hookset *hookset, const EB_Hook *hook);
+EB_Error_Code eb_hook_euc_to_ascii(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_stop_code(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_narrow_character_text(EB_Book *book,
+    EB_Appendix *appendix, void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_wide_character_text(EB_Book *book,
+    EB_Appendix *appendix, void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_newline(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_empty(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+
+/* readtext.c */
+EB_Error_Code eb_seek_text(EB_Book *book, const EB_Position *position);
+EB_Error_Code eb_tell_text(EB_Book *book, EB_Position *position);
+EB_Error_Code eb_read_text(EB_Book *book, EB_Appendix *appendix,
+    EB_Hookset *hookset, void *container, size_t text_max_length, char *text,
+    ssize_t *text_length);
+EB_Error_Code eb_read_heading(EB_Book *book, EB_Appendix *appendix,
+    EB_Hookset *hookset, void *container, size_t text_max_length, char *text,
+    ssize_t *text_length);
+EB_Error_Code eb_read_rawtext(EB_Book *book, size_t text_max_length,
+    char *text, ssize_t *text_length);
+int eb_is_text_stopped(EB_Book *book);
+EB_Error_Code eb_write_text_byte1(EB_Book *book, int byte1);
+EB_Error_Code eb_write_text_byte2(EB_Book *book, int byte1, int byte2);
+EB_Error_Code eb_write_text_string(EB_Book *book, const char *string);
+EB_Error_Code eb_write_text(EB_Book *book, const char * stream,
+    size_t stream_length);
+const char *eb_current_candidate(EB_Book *book);
+EB_Error_Code eb_forward_text(EB_Book *book, EB_Appendix *appendix);
+EB_Error_Code eb_backward_text(EB_Book *book, EB_Appendix *appendix);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_TEXT_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/eb/zio.h goldendict-1.5.0~git20150923/maclibs/include/eb/zio.h
--- goldendict-1.5.0~git20131003/maclibs/include/eb/zio.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/eb/zio.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,237 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 2001-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef ZIO_H
+#define ZIO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+#include <time.h>
+
+/*
+ * Header size of the ebzip compression file.
+ */
+#define ZIO_SIZE_EBZIP_HEADER		22
+
+/*
+ * Margin size for ebzip compression buffer.
+ * (Since compressed data is larger than original in the worst case,
+ * we must add margin to a compression buffer.)
+ */
+#define ZIO_SIZE_EBZIP_MARGIN		1024
+
+/*
+ * Maximum ebzio compression level.
+ */
+#define ZIO_MAX_EBZIP_LEVEL		5
+
+/*
+ * Huffman node types.
+ */
+#define ZIO_HUFFMAN_NODE_INTERMEDIATE	0
+#define ZIO_HUFFMAN_NODE_EOF		1
+#define ZIO_HUFFMAN_NODE_LEAF8		2
+#define ZIO_HUFFMAN_NODE_LEAF16		3
+#define ZIO_HUFFMAN_NODE_LEAF32		4
+
+/*
+ * Compression type codes.
+ */
+#define ZIO_PLAIN			0
+#define ZIO_EBZIP1			1
+#define ZIO_EPWING			2
+#define ZIO_EPWING6			3
+#define ZIO_SEBXA			4
+#define ZIO_INVALID        		-1
+#define ZIO_REOPEN			-2
+
+/*
+ * Compression type.
+ */
+typedef int Zio_Code;
+
+/*
+ * A node of static Huffman tree.
+ */
+typedef struct Zio_Huffman_Node_Struct Zio_Huffman_Node;
+
+struct Zio_Huffman_Node_Struct {
+    /*
+     * node type (ITNERMEDIATE, LEAF8, LEAF16, LEAF32 or EOF).
+     */
+    int type;
+
+    /*
+     * Value of a leaf node.
+     */
+    unsigned int value;
+
+    /*
+     * Frequency of a node.
+     */
+    int frequency;
+
+    /*
+     * Left child.
+     */
+    Zio_Huffman_Node *left;
+
+    /*
+     * Right child.
+     */
+    Zio_Huffman_Node *right;
+};
+
+/*
+ * Compression information of a book.
+ */
+typedef struct Zio_Struct Zio;
+
+struct Zio_Struct {
+    /*
+     * ID.
+     */
+    int id;
+
+    /*
+     * Zio type. (PLAIN, EBZIP, EPWING, EPWING6 or SEBXA)
+     */
+    Zio_Code code;
+
+    /*
+     * File descriptor.
+     */
+    int file;
+
+    /*
+     * Current location.
+     */
+    off_t location;
+
+    /*
+     * Size of an uncompressed file.
+     */
+    off_t file_size;
+
+    /*
+     * Slice size of an EBZIP compressed file.
+     */
+    size_t slice_size;
+
+    /*
+     * Compression level. (EBZIP compression only)
+     */
+    int zip_level;
+
+    /*
+     * Length of an index. (EBZIP compression only)
+     */
+    int index_width;
+
+    /*
+     * Adler-32 check sum of an uncompressed file. (EBZIP compression only)
+     */
+    unsigned int crc;
+
+    /*
+     * mtime of an uncompressed file. (EBZIP compression only)
+     */
+    time_t mtime;
+
+    /*
+     * Location of an index table. (EPWING and S-EBXA compression only)
+     */
+    off_t index_location;
+
+    /*
+     * Length of an index table. (EPWING and S-EBXA compression only)
+     */
+    size_t index_length;
+
+    /*
+     * Location of a frequency table. (EPWING compression only)
+     */
+    off_t frequencies_location;
+
+    /*
+     * Length of a frequency table. (EPWING compression only)
+     */
+    size_t frequencies_length;
+
+    /*
+     * Huffman tree nodes. (EPWING compression only)
+     */
+    Zio_Huffman_Node *huffman_nodes;
+
+    /*
+     * Root node of a Huffman tree. (EPWING compression only)
+     */
+    Zio_Huffman_Node *huffman_root;
+
+    /*
+     * Region of compressed pages. (S-EBXA compression only)
+     */
+    off_t zio_start_location;
+    off_t zio_end_location;
+
+    /*
+     * Add this value to offset written in index. (S-EBXA compression only)
+     */
+    off_t index_base;
+
+    /*
+     * ebnet mode flag.
+     */
+    int is_ebnet;
+};
+
+/*
+ * Function declarations.
+ */
+/* zio.c */
+int zio_initialize_library(void);
+void zio_finalize_library(void);
+void zio_initialize(Zio *zio);
+void zio_finalize(Zio *zio);
+int zio_set_sebxa_mode(Zio *zio, off_t index_location, off_t index_base,
+    off_t zio_start_location, off_t zio_end_location);
+int zio_open(Zio *zio, const char *file_name, Zio_Code zio_code);
+void zio_close(Zio *zio);
+int zio_file(Zio *zio);
+Zio_Code zio_mode(Zio *zio);
+off_t zio_lseek(Zio *zio, off_t offset, int whence);
+ssize_t zio_read(Zio *zio, char *buffer, size_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not ZIO_H */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/tiff/tiffconf.h goldendict-1.5.0~git20150923/maclibs/include/tiff/tiffconf.h
--- goldendict-1.5.0~git20131003/maclibs/include/tiff/tiffconf.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/tiff/tiffconf.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,128 @@
+/* libtiff/tiffconf.h.  Generated from tiffconf.h.in by configure.  */
+/*
+  Configuration defines for installed libtiff.
+  This file maintained for backward compatibility. Do not use definitions
+  from this file in your programs.
+*/
+
+#ifndef _TIFFCONF_
+#define _TIFFCONF_
+
+/* Signed 16-bit type */
+#define TIFF_INT16_T signed short
+
+/* Signed 32-bit type */
+#define TIFF_INT32_T signed int
+
+/* Signed 64-bit type */
+#define TIFF_INT64_T signed long
+
+/* Signed 8-bit type */
+#define TIFF_INT8_T signed char
+
+/* Unsigned 16-bit type */
+#define TIFF_UINT16_T unsigned short
+
+/* Unsigned 32-bit type */
+#define TIFF_UINT32_T unsigned int
+
+/* Unsigned 64-bit type */
+#define TIFF_UINT64_T unsigned long
+
+/* Unsigned 8-bit type */
+#define TIFF_UINT8_T unsigned char
+
+/* Signed size type */
+#define TIFF_SSIZE_T signed long
+
+/* Pointer difference type */
+#define TIFF_PTRDIFF_T ptrdiff_t
+
+/* Define to 1 if the system has the type `int16'. */
+/* #undef HAVE_INT16 */
+
+/* Define to 1 if the system has the type `int32'. */
+/* #undef HAVE_INT32 */
+
+/* Define to 1 if the system has the type `int8'. */
+/* #undef HAVE_INT8 */
+
+/* Compatibility stuff. */
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+   (Intel) */
+#define HOST_BIGENDIAN 0
+
+/* Support CCITT Group 3 & 4 algorithms */
+#define CCITT_SUPPORT 1
+
+/* Support JPEG compression (requires IJG JPEG library) */
+/* #undef JPEG_SUPPORT */
+
+/* Support JBIG compression (requires JBIG-KIT library) */
+/* #undef JBIG_SUPPORT */
+
+/* Support LogLuv high dynamic range encoding */
+#define LOGLUV_SUPPORT 1
+
+/* Support LZW algorithm */
+#define LZW_SUPPORT 1
+
+/* Support NeXT 2-bit RLE algorithm */
+#define NEXT_SUPPORT 1
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+   fails with unpatched IJG JPEG library) */
+/* #undef OJPEG_SUPPORT */
+
+/* Support Macintosh PackBits algorithm */
+#define PACKBITS_SUPPORT 1
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+#define PIXARLOG_SUPPORT 1
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#define THUNDER_SUPPORT 1
+
+/* Support Deflate compression */
+#define ZIP_SUPPORT 1
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+   images to mutiple strips of ~8Kb to reduce memory usage) */
+#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
+
+/* Enable SubIFD tag (330) support */
+#define SUBIFD_SUPPORT 1
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+   packages produce RGBA files but don't mark the alpha properly. */
+#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
+
+/* Support MS MDI magic number files as TIFF */
+#define MDI_SUPPORT 1
+
+/*
+ * Feature support definitions.
+ * XXX: These macros are obsoleted. Don't use them in your apps!
+ * Macros stays here for backward compatibility and should be always defined.
+ */
+#define COLORIMETRY_SUPPORT
+#define YCBCR_SUPPORT
+#define CMYK_SUPPORT
+#define ICC_SUPPORT
+#define PHOTOSHOP_SUPPORT
+#define IPTC_SUPPORT
+
+#endif /* _TIFFCONF_ */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/tiff/tiff.h goldendict-1.5.0~git20150923/maclibs/include/tiff/tiff.h
--- goldendict-1.5.0~git20131003/maclibs/include/tiff/tiff.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/tiff/tiff.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,678 @@
+/* $Id: tiff.h,v 1.68 2012-08-19 16:56:35 bfriesen Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFF_
+#define	_TIFF_
+
+#include "tiffconf.h"
+
+/*
+ * Tag Image File Format (TIFF)
+ *
+ * Based on Rev 6.0 from:
+ *    Developer's Desk
+ *    Aldus Corporation
+ *    411 First Ave. South
+ *    Suite 200
+ *    Seattle, WA  98104
+ *    206-622-5500
+ *
+ *    (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
+ *
+ * For BigTIFF design notes see the following links
+ *    http://www.remotesensing.org/libtiff/bigtiffdesign.html
+ *    http://www.awaresystems.be/imaging/tiff/bigtiff.html
+ */
+
+#define TIFF_VERSION_CLASSIC 42
+#define TIFF_VERSION_BIG 43
+
+#define TIFF_BIGENDIAN      0x4d4d
+#define TIFF_LITTLEENDIAN   0x4949
+#define MDI_LITTLEENDIAN    0x5045
+#define MDI_BIGENDIAN       0x4550
+
+/*
+ * Intrinsic data types required by the file format:
+ *
+ * 8-bit quantities     int8/uint8
+ * 16-bit quantities    int16/uint16
+ * 32-bit quantities    int32/uint32
+ * 64-bit quantities    int64/uint64
+ * strings              unsigned char*
+ */
+
+typedef TIFF_INT8_T   int8;
+typedef TIFF_UINT8_T  uint8;
+
+typedef TIFF_INT16_T  int16;
+typedef TIFF_UINT16_T uint16;
+
+typedef TIFF_INT32_T  int32;
+typedef TIFF_UINT32_T uint32;
+
+typedef TIFF_INT64_T  int64;
+typedef TIFF_UINT64_T uint64;
+
+/*
+ * Some types as promoted in a variable argument list
+ * We use uint16_vap rather then directly using int, because this way
+ * we document the type we actually want to pass through, conceptually,
+ * rather then confusing the issue by merely stating the type it gets
+ * promoted to
+ */
+
+typedef int uint16_vap;
+
+/*
+ * TIFF header.
+ */
+typedef struct {
+	uint16 tiff_magic;      /* magic number (defines byte order) */
+	uint16 tiff_version;    /* TIFF version number */
+} TIFFHeaderCommon;
+typedef struct {
+	uint16 tiff_magic;      /* magic number (defines byte order) */
+	uint16 tiff_version;    /* TIFF version number */
+	uint32 tiff_diroff;     /* byte offset to first directory */
+} TIFFHeaderClassic;
+typedef struct {
+	uint16 tiff_magic;      /* magic number (defines byte order) */
+	uint16 tiff_version;    /* TIFF version number */
+	uint16 tiff_offsetsize; /* size of offsets, should be 8 */
+	uint16 tiff_unused;     /* unused word, should be 0 */
+	uint64 tiff_diroff;     /* byte offset to first directory */
+} TIFFHeaderBig;
+
+
+/*
+ * NB: In the comments below,
+ *  - items marked with a + are obsoleted by revision 5.0,
+ *  - items marked with a ! are introduced in revision 6.0.
+ *  - items marked with a % are introduced post revision 6.0.
+ *  - items marked with a $ are obsoleted by revision 6.0.
+ *  - items marked with a & are introduced by Adobe DNG specification.
+ */
+
+/*
+ * Tag data type information.
+ *
+ * Note: RATIONALs are the ratio of two 32-bit integer values.
+ */
+typedef enum {
+	TIFF_NOTYPE = 0,      /* placeholder */
+	TIFF_BYTE = 1,        /* 8-bit unsigned integer */
+	TIFF_ASCII = 2,       /* 8-bit bytes w/ last byte null */
+	TIFF_SHORT = 3,       /* 16-bit unsigned integer */
+	TIFF_LONG = 4,        /* 32-bit unsigned integer */
+	TIFF_RATIONAL = 5,    /* 64-bit unsigned fraction */
+	TIFF_SBYTE = 6,       /* !8-bit signed integer */
+	TIFF_UNDEFINED = 7,   /* !8-bit untyped data */
+	TIFF_SSHORT = 8,      /* !16-bit signed integer */
+	TIFF_SLONG = 9,       /* !32-bit signed integer */
+	TIFF_SRATIONAL = 10,  /* !64-bit signed fraction */
+	TIFF_FLOAT = 11,      /* !32-bit IEEE floating point */
+	TIFF_DOUBLE = 12,     /* !64-bit IEEE floating point */
+	TIFF_IFD = 13,        /* %32-bit unsigned integer (offset) */
+	TIFF_LONG8 = 16,      /* BigTIFF 64-bit unsigned integer */
+	TIFF_SLONG8 = 17,     /* BigTIFF 64-bit signed integer */
+	TIFF_IFD8 = 18        /* BigTIFF 64-bit unsigned integer (offset) */
+} TIFFDataType;
+
+/*
+ * TIFF Tag Definitions.
+ */
+#define	TIFFTAG_SUBFILETYPE		254	/* subfile data descriptor */
+#define	    FILETYPE_REDUCEDIMAGE	0x1	/* reduced resolution version */
+#define	    FILETYPE_PAGE		0x2	/* one page of many */
+#define	    FILETYPE_MASK		0x4	/* transparency mask */
+#define	TIFFTAG_OSUBFILETYPE		255	/* +kind of data in subfile */
+#define	    OFILETYPE_IMAGE		1	/* full resolution image data */
+#define	    OFILETYPE_REDUCEDIMAGE	2	/* reduced size image data */
+#define	    OFILETYPE_PAGE		3	/* one page of many */
+#define	TIFFTAG_IMAGEWIDTH		256	/* image width in pixels */
+#define	TIFFTAG_IMAGELENGTH		257	/* image height in pixels */
+#define	TIFFTAG_BITSPERSAMPLE		258	/* bits per channel (sample) */
+#define	TIFFTAG_COMPRESSION		259	/* data compression technique */
+#define	    COMPRESSION_NONE		1	/* dump mode */
+#define	    COMPRESSION_CCITTRLE	2	/* CCITT modified Huffman RLE */
+#define	    COMPRESSION_CCITTFAX3	3	/* CCITT Group 3 fax encoding */
+#define     COMPRESSION_CCITT_T4        3       /* CCITT T.4 (TIFF 6 name) */
+#define	    COMPRESSION_CCITTFAX4	4	/* CCITT Group 4 fax encoding */
+#define     COMPRESSION_CCITT_T6        4       /* CCITT T.6 (TIFF 6 name) */
+#define	    COMPRESSION_LZW		5       /* Lempel-Ziv  & Welch */
+#define	    COMPRESSION_OJPEG		6	/* !6.0 JPEG */
+#define	    COMPRESSION_JPEG		7	/* %JPEG DCT compression */
+#define     COMPRESSION_T85			9	/* !TIFF/FX T.85 JBIG compression */
+#define     COMPRESSION_T43			10	/* !TIFF/FX T.43 colour by layered JBIG compression */
+#define	    COMPRESSION_NEXT		32766	/* NeXT 2-bit RLE */
+#define	    COMPRESSION_CCITTRLEW	32771	/* #1 w/ word alignment */
+#define	    COMPRESSION_PACKBITS	32773	/* Macintosh RLE */
+#define	    COMPRESSION_THUNDERSCAN	32809	/* ThunderScan RLE */
+/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
+#define	    COMPRESSION_IT8CTPAD	32895   /* IT8 CT w/padding */
+#define	    COMPRESSION_IT8LW		32896   /* IT8 Linework RLE */
+#define	    COMPRESSION_IT8MP		32897   /* IT8 Monochrome picture */
+#define	    COMPRESSION_IT8BL		32898   /* IT8 Binary line art */
+/* compression codes 32908-32911 are reserved for Pixar */
+#define     COMPRESSION_PIXARFILM	32908   /* Pixar companded 10bit LZW */
+#define	    COMPRESSION_PIXARLOG	32909   /* Pixar companded 11bit ZIP */
+#define	    COMPRESSION_DEFLATE		32946	/* Deflate compression */
+#define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression,
+						   as recognized by Adobe */
+/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
+#define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
+#define	    COMPRESSION_JBIG		34661	/* ISO JBIG */
+#define     COMPRESSION_SGILOG		34676	/* SGI Log Luminance RLE */
+#define     COMPRESSION_SGILOG24	34677	/* SGI Log 24-bit packed */
+#define     COMPRESSION_JP2000          34712   /* Leadtools JPEG2000 */
+#define	    COMPRESSION_LZMA		34925	/* LZMA2 */
+#define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
+#define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
+#define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */
+#define	    PHOTOMETRIC_RGB		2	/* RGB color model */
+#define	    PHOTOMETRIC_PALETTE		3	/* color map indexed */
+#define	    PHOTOMETRIC_MASK		4	/* $holdout mask */
+#define	    PHOTOMETRIC_SEPARATED	5	/* !color separations */
+#define	    PHOTOMETRIC_YCBCR		6	/* !CCIR 601 */
+#define	    PHOTOMETRIC_CIELAB		8	/* !1976 CIE L*a*b* */
+#define	    PHOTOMETRIC_ICCLAB		9	/* ICC L*a*b* [Adobe TIFF Technote 4] */
+#define	    PHOTOMETRIC_ITULAB		10	/* ITU L*a*b* */
+#define     PHOTOMETRIC_LOGL		32844	/* CIE Log2(L) */
+#define     PHOTOMETRIC_LOGLUV		32845	/* CIE Log2(L) (u',v') */
+#define	TIFFTAG_THRESHHOLDING		263	/* +thresholding used on data */
+#define	    THRESHHOLD_BILEVEL		1	/* b&w art scan */
+#define	    THRESHHOLD_HALFTONE		2	/* or dithered scan */
+#define	    THRESHHOLD_ERRORDIFFUSE	3	/* usually floyd-steinberg */
+#define	TIFFTAG_CELLWIDTH		264	/* +dithering matrix width */
+#define	TIFFTAG_CELLLENGTH		265	/* +dithering matrix height */
+#define	TIFFTAG_FILLORDER		266	/* data order within a byte */
+#define	    FILLORDER_MSB2LSB		1	/* most significant -> least */
+#define	    FILLORDER_LSB2MSB		2	/* least significant -> most */
+#define	TIFFTAG_DOCUMENTNAME		269	/* name of doc. image is from */
+#define	TIFFTAG_IMAGEDESCRIPTION	270	/* info about image */
+#define	TIFFTAG_MAKE			271	/* scanner manufacturer name */
+#define	TIFFTAG_MODEL			272	/* scanner model name/number */
+#define	TIFFTAG_STRIPOFFSETS		273	/* offsets to data strips */
+#define	TIFFTAG_ORIENTATION		274	/* +image orientation */
+#define	    ORIENTATION_TOPLEFT		1	/* row 0 top, col 0 lhs */
+#define	    ORIENTATION_TOPRIGHT	2	/* row 0 top, col 0 rhs */
+#define	    ORIENTATION_BOTRIGHT	3	/* row 0 bottom, col 0 rhs */
+#define	    ORIENTATION_BOTLEFT		4	/* row 0 bottom, col 0 lhs */
+#define	    ORIENTATION_LEFTTOP		5	/* row 0 lhs, col 0 top */
+#define	    ORIENTATION_RIGHTTOP	6	/* row 0 rhs, col 0 top */
+#define	    ORIENTATION_RIGHTBOT	7	/* row 0 rhs, col 0 bottom */
+#define	    ORIENTATION_LEFTBOT		8	/* row 0 lhs, col 0 bottom */
+#define	TIFFTAG_SAMPLESPERPIXEL		277	/* samples per pixel */
+#define	TIFFTAG_ROWSPERSTRIP		278	/* rows per strip of data */
+#define	TIFFTAG_STRIPBYTECOUNTS		279	/* bytes counts for strips */
+#define	TIFFTAG_MINSAMPLEVALUE		280	/* +minimum sample value */
+#define	TIFFTAG_MAXSAMPLEVALUE		281	/* +maximum sample value */
+#define	TIFFTAG_XRESOLUTION		282	/* pixels/resolution in x */
+#define	TIFFTAG_YRESOLUTION		283	/* pixels/resolution in y */
+#define	TIFFTAG_PLANARCONFIG		284	/* storage organization */
+#define	    PLANARCONFIG_CONTIG		1	/* single image plane */
+#define	    PLANARCONFIG_SEPARATE	2	/* separate planes of data */
+#define	TIFFTAG_PAGENAME		285	/* page name image is from */
+#define	TIFFTAG_XPOSITION		286	/* x page offset of image lhs */
+#define	TIFFTAG_YPOSITION		287	/* y page offset of image lhs */
+#define	TIFFTAG_FREEOFFSETS		288	/* +byte offset to free block */
+#define	TIFFTAG_FREEBYTECOUNTS		289	/* +sizes of free blocks */
+#define	TIFFTAG_GRAYRESPONSEUNIT	290	/* $gray scale curve accuracy */
+#define	    GRAYRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    GRAYRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    GRAYRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_GRAYRESPONSECURVE	291	/* $gray scale response curve */
+#define	TIFFTAG_GROUP3OPTIONS		292	/* 32 flag bits */
+#define	TIFFTAG_T4OPTIONS		292	/* TIFF 6.0 proper name alias */
+#define	    GROUP3OPT_2DENCODING	0x1	/* 2-dimensional coding */
+#define	    GROUP3OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	    GROUP3OPT_FILLBITS		0x4	/* fill to byte boundary */
+#define	TIFFTAG_GROUP4OPTIONS		293	/* 32 flag bits */
+#define TIFFTAG_T6OPTIONS               293     /* TIFF 6.0 proper name */
+#define	    GROUP4OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	TIFFTAG_RESOLUTIONUNIT		296	/* units of resolutions */
+#define	    RESUNIT_NONE		1	/* no meaningful units */
+#define	    RESUNIT_INCH		2	/* english */
+#define	    RESUNIT_CENTIMETER		3	/* metric */
+#define	TIFFTAG_PAGENUMBER		297	/* page numbers of multi-page */
+#define	TIFFTAG_COLORRESPONSEUNIT	300	/* $color curve accuracy */
+#define	    COLORRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    COLORRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    COLORRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    COLORRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    COLORRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_TRANSFERFUNCTION	301	/* !colorimetry info */
+#define	TIFFTAG_SOFTWARE		305	/* name & release */
+#define	TIFFTAG_DATETIME		306	/* creation date and time */
+#define	TIFFTAG_ARTIST			315	/* creator of image */
+#define	TIFFTAG_HOSTCOMPUTER		316	/* machine where created */
+#define	TIFFTAG_PREDICTOR		317	/* prediction scheme w/ LZW */
+#define     PREDICTOR_NONE		1	/* no prediction scheme used */
+#define     PREDICTOR_HORIZONTAL	2	/* horizontal differencing */
+#define     PREDICTOR_FLOATINGPOINT	3	/* floating point predictor */
+#define	TIFFTAG_WHITEPOINT		318	/* image white point */
+#define	TIFFTAG_PRIMARYCHROMATICITIES	319	/* !primary chromaticities */
+#define	TIFFTAG_COLORMAP		320	/* RGB map for pallette image */
+#define	TIFFTAG_HALFTONEHINTS		321	/* !highlight+shadow info */
+#define	TIFFTAG_TILEWIDTH		322	/* !tile width in pixels */
+#define	TIFFTAG_TILELENGTH		323	/* !tile height in pixels */
+#define TIFFTAG_TILEOFFSETS		324	/* !offsets to data tiles */
+#define TIFFTAG_TILEBYTECOUNTS		325	/* !byte counts for tiles */
+#define	TIFFTAG_BADFAXLINES		326	/* lines w/ wrong pixel count */
+#define	TIFFTAG_CLEANFAXDATA		327	/* regenerated line info */
+#define	    CLEANFAXDATA_CLEAN		0	/* no errors detected */
+#define	    CLEANFAXDATA_REGENERATED	1	/* receiver regenerated lines */
+#define	    CLEANFAXDATA_UNCLEAN	2	/* uncorrected errors exist */
+#define	TIFFTAG_CONSECUTIVEBADFAXLINES	328	/* max consecutive bad lines */
+#define	TIFFTAG_SUBIFD			330	/* subimage descriptors */
+#define	TIFFTAG_INKSET			332	/* !inks in separated image */
+#define	    INKSET_CMYK			1	/* !cyan-magenta-yellow-black color */
+#define	    INKSET_MULTIINK		2	/* !multi-ink or hi-fi color */
+#define	TIFFTAG_INKNAMES		333	/* !ascii names of inks */
+#define	TIFFTAG_NUMBEROFINKS		334	/* !number of inks */
+#define	TIFFTAG_DOTRANGE		336	/* !0% and 100% dot codes */
+#define	TIFFTAG_TARGETPRINTER		337	/* !separation target */
+#define	TIFFTAG_EXTRASAMPLES		338	/* !info about extra samples */
+#define	    EXTRASAMPLE_UNSPECIFIED	0	/* !unspecified data */
+#define	    EXTRASAMPLE_ASSOCALPHA	1	/* !associated alpha data */
+#define	    EXTRASAMPLE_UNASSALPHA	2	/* !unassociated alpha data */
+#define	TIFFTAG_SAMPLEFORMAT		339	/* !data sample format */
+#define	    SAMPLEFORMAT_UINT		1	/* !unsigned integer data */
+#define	    SAMPLEFORMAT_INT		2	/* !signed integer data */
+#define	    SAMPLEFORMAT_IEEEFP		3	/* !IEEE floating point data */
+#define	    SAMPLEFORMAT_VOID		4	/* !untyped data */
+#define	    SAMPLEFORMAT_COMPLEXINT	5	/* !complex signed int */
+#define	    SAMPLEFORMAT_COMPLEXIEEEFP	6	/* !complex ieee floating */
+#define	TIFFTAG_SMINSAMPLEVALUE		340	/* !variable MinSampleValue */
+#define	TIFFTAG_SMAXSAMPLEVALUE		341	/* !variable MaxSampleValue */
+#define	TIFFTAG_CLIPPATH		343	/* %ClipPath
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_XCLIPPATHUNITS		344	/* %XClipPathUnits
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_YCLIPPATHUNITS		345	/* %YClipPathUnits
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_INDEXED			346	/* %Indexed
+						   [Adobe TIFF Technote 3] */
+#define	TIFFTAG_JPEGTABLES		347	/* %JPEG table stream */
+#define	TIFFTAG_OPIPROXY		351	/* %OPI Proxy [Adobe TIFF technote] */
+/* Tags 400-435 are from the TIFF/FX spec */
+#define TIFFTAG_GLOBALPARAMETERSIFD	400	/* ! */
+#define TIFFTAG_PROFILETYPE			401	/* ! */
+#define     PROFILETYPE_UNSPECIFIED	0	/* ! */
+#define     PROFILETYPE_G3_FAX		1	/* ! */
+#define TIFFTAG_FAXPROFILE			402	/* ! */
+#define     FAXPROFILE_S			1	/* !TIFF/FX FAX profile S */
+#define     FAXPROFILE_F			2	/* !TIFF/FX FAX profile F */
+#define     FAXPROFILE_J			3	/* !TIFF/FX FAX profile J */
+#define     FAXPROFILE_C			4	/* !TIFF/FX FAX profile C */
+#define     FAXPROFILE_L			5	/* !TIFF/FX FAX profile L */
+#define     FAXPROFILE_M			6	/* !TIFF/FX FAX profile LM */
+#define TIFFTAG_CODINGMETHODS		403	/* !TIFF/FX coding methods */
+#define     CODINGMETHODS_T4_1D		(1 << 1)	/* !T.4 1D */
+#define     CODINGMETHODS_T4_2D		(1 << 2)	/* !T.4 2D */
+#define     CODINGMETHODS_T6		(1 << 3)	/* !T.6 */
+#define     CODINGMETHODS_T85 		(1 << 4)	/* !T.85 JBIG */
+#define     CODINGMETHODS_T42 		(1 << 5)	/* !T.42 JPEG */
+#define     CODINGMETHODS_T43		(1 << 6)	/* !T.43 colour by layered JBIG */
+#define TIFFTAG_VERSIONYEAR			404	/* !TIFF/FX version year */
+#define TIFFTAG_MODENUMBER			405	/* !TIFF/FX mode number */
+#define TIFFTAG_DECODE				433	/* !TIFF/FX decode */
+#define TIFFTAG_IMAGEBASECOLOR		434	/* !TIFF/FX image base colour */
+#define TIFFTAG_T82OPTIONS			435	/* !TIFF/FX T.82 options */
+/*
+ * Tags 512-521 are obsoleted by Technical Note #2 which specifies a
+ * revised JPEG-in-TIFF scheme.
+ */
+#define	TIFFTAG_JPEGPROC		512	/* !JPEG processing algorithm */
+#define	    JPEGPROC_BASELINE		1	/* !baseline sequential */
+#define	    JPEGPROC_LOSSLESS		14	/* !Huffman coded lossless */
+#define	TIFFTAG_JPEGIFOFFSET		513	/* !pointer to SOI marker */
+#define	TIFFTAG_JPEGIFBYTECOUNT		514	/* !JFIF stream length */
+#define	TIFFTAG_JPEGRESTARTINTERVAL	515	/* !restart interval length */
+#define	TIFFTAG_JPEGLOSSLESSPREDICTORS	517	/* !lossless proc predictor */
+#define	TIFFTAG_JPEGPOINTTRANSFORM	518	/* !lossless point transform */
+#define	TIFFTAG_JPEGQTABLES		519	/* !Q matrice offsets */
+#define	TIFFTAG_JPEGDCTABLES		520	/* !DCT table offsets */
+#define	TIFFTAG_JPEGACTABLES		521	/* !AC coefficient offsets */
+#define	TIFFTAG_YCBCRCOEFFICIENTS	529	/* !RGB -> YCbCr transform */
+#define	TIFFTAG_YCBCRSUBSAMPLING	530	/* !YCbCr subsampling factors */
+#define	TIFFTAG_YCBCRPOSITIONING	531	/* !subsample positioning */
+#define	    YCBCRPOSITION_CENTERED	1	/* !as in PostScript Level 2 */
+#define	    YCBCRPOSITION_COSITED	2	/* !as in CCIR 601-1 */
+#define	TIFFTAG_REFERENCEBLACKWHITE	532	/* !colorimetry info */
+#define TIFFTAG_STRIPROWCOUNTS		559 /* !TIFF/FX strip row counts */
+#define	TIFFTAG_XMLPACKET		700	/* %XML packet
+						   [Adobe XMP Specification,
+						   January 2004 */
+#define TIFFTAG_OPIIMAGEID		32781	/* %OPI ImageID
+						   [Adobe TIFF technote] */
+/* tags 32952-32956 are private tags registered to Island Graphics */
+#define TIFFTAG_REFPTS			32953	/* image reference points */
+#define TIFFTAG_REGIONTACKPOINT		32954	/* region-xform tack point */
+#define TIFFTAG_REGIONWARPCORNERS	32955	/* warp quadrilateral */
+#define TIFFTAG_REGIONAFFINE		32956	/* affine transformation mat */
+/* tags 32995-32999 are private tags registered to SGI */
+#define	TIFFTAG_MATTEING		32995	/* $use ExtraSamples */
+#define	TIFFTAG_DATATYPE		32996	/* $use SampleFormat */
+#define	TIFFTAG_IMAGEDEPTH		32997	/* z depth of image */
+#define	TIFFTAG_TILEDEPTH		32998	/* z depth/data tile */
+/* tags 33300-33309 are private tags registered to Pixar */
+/*
+ * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
+ * are set when an image has been cropped out of a larger image.  
+ * They reflect the size of the original uncropped image.
+ * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used
+ * to determine the position of the smaller image in the larger one.
+ */
+#define TIFFTAG_PIXAR_IMAGEFULLWIDTH    33300   /* full image size in x */
+#define TIFFTAG_PIXAR_IMAGEFULLLENGTH   33301   /* full image size in y */
+ /* Tags 33302-33306 are used to identify special image modes and data
+  * used by Pixar's texture formats.
+  */
+#define TIFFTAG_PIXAR_TEXTUREFORMAT	33302	/* texture map format */
+#define TIFFTAG_PIXAR_WRAPMODES		33303	/* s & t wrap modes */
+#define TIFFTAG_PIXAR_FOVCOT		33304	/* cotan(fov) for env. maps */
+#define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
+#define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
+/* tag 33405 is a private tag registered to Eastman Kodak */
+#define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
+/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
+#define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+/* IPTC TAG from RichTIFF specifications */
+#define TIFFTAG_RICHTIFFIPTC		33723
+/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
+#define TIFFTAG_IT8SITE			34016	/* site name */
+#define TIFFTAG_IT8COLORSEQUENCE	34017	/* color seq. [RGB,CMYK,etc] */
+#define TIFFTAG_IT8HEADER		34018	/* DDES Header */
+#define TIFFTAG_IT8RASTERPADDING	34019	/* raster scanline padding */
+#define TIFFTAG_IT8BITSPERRUNLENGTH	34020	/* # of bits in short run */
+#define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */
+#define TIFFTAG_IT8COLORTABLE		34022	/* LW colortable */
+#define TIFFTAG_IT8IMAGECOLORINDICATOR	34023	/* BP/BL image color switch */
+#define TIFFTAG_IT8BKGCOLORINDICATOR	34024	/* BP/BL bg color switch */
+#define TIFFTAG_IT8IMAGECOLORVALUE	34025	/* BP/BL image color value */
+#define TIFFTAG_IT8BKGCOLORVALUE	34026	/* BP/BL bg color value */
+#define TIFFTAG_IT8PIXELINTENSITYRANGE	34027	/* MP pixel intensity value */
+#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028	/* HC transparency switch */
+#define TIFFTAG_IT8COLORCHARACTERIZATION 34029	/* color character. table */
+#define TIFFTAG_IT8HCUSAGE		34030	/* HC usage indicator */
+#define TIFFTAG_IT8TRAPINDICATOR	34031	/* Trapping indicator
+						   (untrapped=0, trapped=1) */
+#define TIFFTAG_IT8CMYKEQUIVALENT	34032	/* CMYK color equivalents */
+/* tags 34232-34236 are private tags registered to Texas Instruments */
+#define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
+/* tag 34377 is private tag registered to Adobe for PhotoShop */
+#define TIFFTAG_PHOTOSHOP		34377 
+/* tags 34665, 34853 and 40965 are documented in EXIF specification */
+#define TIFFTAG_EXIFIFD			34665	/* Pointer to EXIF private directory */
+/* tag 34750 is a private tag registered to Adobe? */
+#define TIFFTAG_ICCPROFILE		34675	/* ICC profile data */
+#define TIFFTAG_IMAGELAYER		34732	/* !TIFF/FX image layer information */
+/* tag 34750 is a private tag registered to Pixel Magic */
+#define	TIFFTAG_JBIGOPTIONS		34750	/* JBIG options */
+#define TIFFTAG_GPSIFD			34853	/* Pointer to GPS private directory */
+/* tags 34908-34914 are private tags registered to SGI */
+#define	TIFFTAG_FAXRECVPARAMS		34908	/* encoded Class 2 ses. parms */
+#define	TIFFTAG_FAXSUBADDRESS		34909	/* received SubAddr string */
+#define	TIFFTAG_FAXRECVTIME		34910	/* receive time (secs) */
+#define	TIFFTAG_FAXDCS			34911	/* encoded fax ses. params, Table 2/T.30 */
+/* tags 37439-37443 are registered to SGI <gregl@sgi.com> */
+#define TIFFTAG_STONITS			37439	/* Sample value to Nits */
+/* tag 34929 is a private tag registered to FedEx */
+#define	TIFFTAG_FEDEX_EDR		34929	/* unknown use */
+#define TIFFTAG_INTEROPERABILITYIFD	40965	/* Pointer to Interoperability private directory */
+/* Adobe Digital Negative (DNG) format tags */
+#define TIFFTAG_DNGVERSION		50706	/* &DNG version number */
+#define TIFFTAG_DNGBACKWARDVERSION	50707	/* &DNG compatibility version */
+#define TIFFTAG_UNIQUECAMERAMODEL	50708	/* &name for the camera model */
+#define TIFFTAG_LOCALIZEDCAMERAMODEL	50709	/* &localized camera model
+						   name */
+#define TIFFTAG_CFAPLANECOLOR		50710	/* &CFAPattern->LinearRaw space
+						   mapping */
+#define TIFFTAG_CFALAYOUT		50711	/* &spatial layout of the CFA */
+#define TIFFTAG_LINEARIZATIONTABLE	50712	/* &lookup table description */
+#define TIFFTAG_BLACKLEVELREPEATDIM	50713	/* &repeat pattern size for
+						   the BlackLevel tag */
+#define TIFFTAG_BLACKLEVEL		50714	/* &zero light encoding level */
+#define TIFFTAG_BLACKLEVELDELTAH	50715	/* &zero light encoding level
+						   differences (columns) */
+#define TIFFTAG_BLACKLEVELDELTAV	50716	/* &zero light encoding level
+						   differences (rows) */
+#define TIFFTAG_WHITELEVEL		50717	/* &fully saturated encoding
+						   level */
+#define TIFFTAG_DEFAULTSCALE		50718	/* &default scale factors */
+#define TIFFTAG_DEFAULTCROPORIGIN	50719	/* &origin of the final image
+						   area */
+#define TIFFTAG_DEFAULTCROPSIZE		50720	/* &size of the final image 
+						   area */
+#define TIFFTAG_COLORMATRIX1		50721	/* &XYZ->reference color space
+						   transformation matrix 1 */
+#define TIFFTAG_COLORMATRIX2		50722	/* &XYZ->reference color space
+						   transformation matrix 2 */
+#define TIFFTAG_CAMERACALIBRATION1	50723	/* &calibration matrix 1 */
+#define TIFFTAG_CAMERACALIBRATION2	50724	/* &calibration matrix 2 */
+#define TIFFTAG_REDUCTIONMATRIX1	50725	/* &dimensionality reduction
+						   matrix 1 */
+#define TIFFTAG_REDUCTIONMATRIX2	50726	/* &dimensionality reduction
+						   matrix 2 */
+#define TIFFTAG_ANALOGBALANCE		50727	/* &gain applied the stored raw
+						   values*/
+#define TIFFTAG_ASSHOTNEUTRAL		50728	/* &selected white balance in
+						   linear reference space */
+#define TIFFTAG_ASSHOTWHITEXY		50729	/* &selected white balance in
+						   x-y chromaticity
+						   coordinates */
+#define TIFFTAG_BASELINEEXPOSURE	50730	/* &how much to move the zero
+						   point */
+#define TIFFTAG_BASELINENOISE		50731	/* &relative noise level */
+#define TIFFTAG_BASELINESHARPNESS	50732	/* &relative amount of
+						   sharpening */
+#define TIFFTAG_BAYERGREENSPLIT		50733	/* &how closely the values of
+						   the green pixels in the
+						   blue/green rows track the
+						   values of the green pixels
+						   in the red/green rows */
+#define TIFFTAG_LINEARRESPONSELIMIT	50734	/* &non-linear encoding range */
+#define TIFFTAG_CAMERASERIALNUMBER	50735	/* &camera's serial number */
+#define TIFFTAG_LENSINFO		50736	/* info about the lens */
+#define TIFFTAG_CHROMABLURRADIUS	50737	/* &chroma blur radius */
+#define TIFFTAG_ANTIALIASSTRENGTH	50738	/* &relative strength of the
+						   camera's anti-alias filter */
+#define TIFFTAG_SHADOWSCALE		50739	/* &used by Adobe Camera Raw */
+#define TIFFTAG_DNGPRIVATEDATA		50740	/* &manufacturer's private data */
+#define TIFFTAG_MAKERNOTESAFETY		50741	/* &whether the EXIF MakerNote
+						   tag is safe to preserve
+						   along with the rest of the
+						   EXIF data */
+#define	TIFFTAG_CALIBRATIONILLUMINANT1	50778	/* &illuminant 1 */
+#define TIFFTAG_CALIBRATIONILLUMINANT2	50779	/* &illuminant 2 */
+#define TIFFTAG_BESTQUALITYSCALE	50780	/* &best quality multiplier */
+#define TIFFTAG_RAWDATAUNIQUEID		50781	/* &unique identifier for
+						   the raw image data */
+#define TIFFTAG_ORIGINALRAWFILENAME	50827	/* &file name of the original
+						   raw file */
+#define TIFFTAG_ORIGINALRAWFILEDATA	50828	/* &contents of the original
+						   raw file */
+#define TIFFTAG_ACTIVEAREA		50829	/* &active (non-masked) pixels
+						   of the sensor */
+#define TIFFTAG_MASKEDAREAS		50830	/* &list of coordinates
+						   of fully masked pixels */
+#define TIFFTAG_ASSHOTICCPROFILE	50831	/* &these two tags used to */
+#define TIFFTAG_ASSHOTPREPROFILEMATRIX	50832	/* map cameras's color space
+						   into ICC profile space */
+#define TIFFTAG_CURRENTICCPROFILE	50833	/* & */
+#define TIFFTAG_CURRENTPREPROFILEMATRIX	50834	/* & */
+/* tag 65535 is an undefined tag used by Eastman Kodak */
+#define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
+
+/*
+ * The following are ``pseudo tags'' that can be used to control
+ * codec-specific functionality.  These tags are not written to file.
+ * Note that these values start at 0xffff+1 so that they'll never
+ * collide with Aldus-assigned tags.
+ *
+ * If you want your private pseudo tags ``registered'' (i.e. added to
+ * this file), please post a bug report via the tracking system at
+ * http://www.remotesensing.org/libtiff/bugs.html with the appropriate
+ * C definitions to add.
+ */
+#define	TIFFTAG_FAXMODE			65536	/* Group 3/4 format control */
+#define	    FAXMODE_CLASSIC	0x0000		/* default, include RTC */
+#define	    FAXMODE_NORTC	0x0001		/* no RTC at end of data */
+#define	    FAXMODE_NOEOL	0x0002		/* no EOL code at end of row */
+#define	    FAXMODE_BYTEALIGN	0x0004		/* byte align row */
+#define	    FAXMODE_WORDALIGN	0x0008		/* word align row */
+#define	    FAXMODE_CLASSF	FAXMODE_NORTC	/* TIFF Class F */
+#define	TIFFTAG_JPEGQUALITY		65537	/* Compression quality level */
+/* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
+#define	TIFFTAG_JPEGCOLORMODE		65538	/* Auto RGB<=>YCbCr convert? */
+#define	    JPEGCOLORMODE_RAW	0x0000		/* no conversion (default) */
+#define	    JPEGCOLORMODE_RGB	0x0001		/* do auto conversion */
+#define	TIFFTAG_JPEGTABLESMODE		65539	/* What to put in JPEGTables */
+#define	    JPEGTABLESMODE_QUANT 0x0001		/* include quantization tbls */
+#define	    JPEGTABLESMODE_HUFF	0x0002		/* include Huffman tbls */
+/* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
+#define	TIFFTAG_FAXFILLFUNC		65540	/* G3/G4 fill function */
+#define	TIFFTAG_PIXARLOGDATAFMT		65549	/* PixarLogCodec I/O data sz */
+#define	    PIXARLOGDATAFMT_8BIT	0	/* regular u_char samples */
+#define	    PIXARLOGDATAFMT_8BITABGR	1	/* ABGR-order u_chars */
+#define	    PIXARLOGDATAFMT_11BITLOG	2	/* 11-bit log-encoded (raw) */
+#define	    PIXARLOGDATAFMT_12BITPICIO	3	/* as per PICIO (1.0==2048) */
+#define	    PIXARLOGDATAFMT_16BIT	4	/* signed short samples */
+#define	    PIXARLOGDATAFMT_FLOAT	5	/* IEEE float samples */
+/* 65550-65556 are allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
+#define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
+#define     DCSIMAGERMODEL_M5           1       /* M5 chip (1536 x 1024) */
+#define     DCSIMAGERMODEL_M6           2       /* M6 chip (3072 x 2048) */
+#define     DCSIMAGERFILTER_IR          0       /* infrared filter */
+#define     DCSIMAGERFILTER_MONO        1       /* monochrome filter */
+#define     DCSIMAGERFILTER_CFA         2       /* color filter array */
+#define     DCSIMAGERFILTER_OTHER       3       /* other filter */
+#define TIFFTAG_DCSINTERPMODE           65551   /* interpolation mode */
+#define     DCSINTERPMODE_NORMAL        0x0     /* whole image, default */
+#define     DCSINTERPMODE_PREVIEW       0x1     /* preview of image (384x256) */
+#define TIFFTAG_DCSBALANCEARRAY         65552   /* color balance values */
+#define TIFFTAG_DCSCORRECTMATRIX        65553   /* color correction values */
+#define TIFFTAG_DCSGAMMA                65554   /* gamma value */
+#define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
+#define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
+/* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
+#define	TIFFTAG_ZIPQUALITY		65557	/* compression quality level */
+#define	TIFFTAG_PIXARLOGQUALITY		65558	/* PixarLog uses same scale */
+/* 65559 is allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSCLIPRECTANGLE	65559	/* area of image to acquire */
+#define TIFFTAG_SGILOGDATAFMT		65560	/* SGILog user data format */
+#define     SGILOGDATAFMT_FLOAT		0	/* IEEE float samples */
+#define     SGILOGDATAFMT_16BIT		1	/* 16-bit samples */
+#define     SGILOGDATAFMT_RAW		2	/* uninterpreted data */
+#define     SGILOGDATAFMT_8BIT		3	/* 8-bit RGB monitor values */
+#define TIFFTAG_SGILOGENCODE		65561 /* SGILog data encoding control*/
+#define     SGILOGENCODE_NODITHER	0     /* do not dither encoded values*/
+#define     SGILOGENCODE_RANDITHER	1     /* randomly dither encd values */
+#define	TIFFTAG_LZMAPRESET		65562	/* LZMA2 preset (compression level) */
+#define TIFFTAG_PERSAMPLE       65563	/* interface for per sample tags */
+#define     PERSAMPLE_MERGED        0	/* present as a single value */
+#define     PERSAMPLE_MULTI         1	/* present as multiple values */
+
+/*
+ * EXIF tags
+ */
+#define EXIFTAG_EXPOSURETIME		33434	/* Exposure time */
+#define EXIFTAG_FNUMBER			33437	/* F number */
+#define EXIFTAG_EXPOSUREPROGRAM		34850	/* Exposure program */
+#define EXIFTAG_SPECTRALSENSITIVITY	34852	/* Spectral sensitivity */
+#define EXIFTAG_ISOSPEEDRATINGS		34855	/* ISO speed rating */
+#define EXIFTAG_OECF			34856	/* Optoelectric conversion
+						   factor */
+#define EXIFTAG_EXIFVERSION		36864	/* Exif version */
+#define EXIFTAG_DATETIMEORIGINAL	36867	/* Date and time of original
+						   data generation */
+#define EXIFTAG_DATETIMEDIGITIZED	36868	/* Date and time of digital
+						   data generation */
+#define EXIFTAG_COMPONENTSCONFIGURATION	37121	/* Meaning of each component */
+#define EXIFTAG_COMPRESSEDBITSPERPIXEL	37122	/* Image compression mode */
+#define EXIFTAG_SHUTTERSPEEDVALUE	37377	/* Shutter speed */
+#define EXIFTAG_APERTUREVALUE		37378	/* Aperture */
+#define EXIFTAG_BRIGHTNESSVALUE		37379	/* Brightness */
+#define EXIFTAG_EXPOSUREBIASVALUE	37380	/* Exposure bias */
+#define EXIFTAG_MAXAPERTUREVALUE	37381	/* Maximum lens aperture */
+#define EXIFTAG_SUBJECTDISTANCE		37382	/* Subject distance */
+#define EXIFTAG_METERINGMODE		37383	/* Metering mode */
+#define EXIFTAG_LIGHTSOURCE		37384	/* Light source */
+#define EXIFTAG_FLASH			37385	/* Flash */
+#define EXIFTAG_FOCALLENGTH		37386	/* Lens focal length */
+#define EXIFTAG_SUBJECTAREA		37396	/* Subject area */
+#define EXIFTAG_MAKERNOTE		37500	/* Manufacturer notes */
+#define EXIFTAG_USERCOMMENT		37510	/* User comments */
+#define EXIFTAG_SUBSECTIME		37520	/* DateTime subseconds */
+#define EXIFTAG_SUBSECTIMEORIGINAL	37521	/* DateTimeOriginal subseconds */
+#define EXIFTAG_SUBSECTIMEDIGITIZED	37522	/* DateTimeDigitized subseconds */
+#define EXIFTAG_FLASHPIXVERSION		40960	/* Supported Flashpix version */
+#define EXIFTAG_COLORSPACE		40961	/* Color space information */
+#define EXIFTAG_PIXELXDIMENSION		40962	/* Valid image width */
+#define EXIFTAG_PIXELYDIMENSION		40963	/* Valid image height */
+#define EXIFTAG_RELATEDSOUNDFILE	40964	/* Related audio file */
+#define EXIFTAG_FLASHENERGY		41483	/* Flash energy */
+#define EXIFTAG_SPATIALFREQUENCYRESPONSE 41484	/* Spatial frequency response */
+#define EXIFTAG_FOCALPLANEXRESOLUTION	41486	/* Focal plane X resolution */
+#define EXIFTAG_FOCALPLANEYRESOLUTION	41487	/* Focal plane Y resolution */
+#define EXIFTAG_FOCALPLANERESOLUTIONUNIT 41488	/* Focal plane resolution unit */
+#define EXIFTAG_SUBJECTLOCATION		41492	/* Subject location */
+#define EXIFTAG_EXPOSUREINDEX		41493	/* Exposure index */
+#define EXIFTAG_SENSINGMETHOD		41495	/* Sensing method */
+#define EXIFTAG_FILESOURCE		41728	/* File source */
+#define EXIFTAG_SCENETYPE		41729	/* Scene type */
+#define EXIFTAG_CFAPATTERN		41730	/* CFA pattern */
+#define EXIFTAG_CUSTOMRENDERED		41985	/* Custom image processing */
+#define EXIFTAG_EXPOSUREMODE		41986	/* Exposure mode */
+#define EXIFTAG_WHITEBALANCE		41987	/* White balance */
+#define EXIFTAG_DIGITALZOOMRATIO	41988	/* Digital zoom ratio */
+#define EXIFTAG_FOCALLENGTHIN35MMFILM	41989	/* Focal length in 35 mm film */
+#define EXIFTAG_SCENECAPTURETYPE	41990	/* Scene capture type */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_CONTRAST		41992	/* Contrast */
+#define EXIFTAG_SATURATION		41993	/* Saturation */
+#define EXIFTAG_SHARPNESS		41994	/* Sharpness */
+#define EXIFTAG_DEVICESETTINGDESCRIPTION 41995	/* Device settings description */
+#define EXIFTAG_SUBJECTDISTANCERANGE	41996	/* Subject distance range */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_IMAGEUNIQUEID		42016	/* Unique image ID */
+
+#endif /* _TIFF_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/tiff/tiffio.h goldendict-1.5.0~git20150923/maclibs/include/tiff/tiffio.h
--- goldendict-1.5.0~git20131003/maclibs/include/tiff/tiffio.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/tiff/tiffio.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,557 @@
+/* $Id: tiffio.h,v 1.91 2012-07-29 15:45:29 tgl Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIO_
+#define	_TIFFIO_
+
+/*
+ * TIFF I/O Library Definitions.
+ */
+#include "tiff.h"
+#include "tiffvers.h"
+
+/*
+ * TIFF is defined as an incomplete type to hide the
+ * library's internal data structures from clients.
+ */
+typedef struct tiff TIFF;
+
+/*
+ * The following typedefs define the intrinsic size of
+ * data types used in the *exported* interfaces.  These
+ * definitions depend on the proper definition of types
+ * in tiff.h.  Note also that the varargs interface used
+ * to pass tag types and values uses the types defined in
+ * tiff.h directly.
+ *
+ * NB: ttag_t is unsigned int and not unsigned short because
+ *     ANSI C requires that the type before the ellipsis be a
+ *     promoted type (i.e. one of int, unsigned int, pointer,
+ *     or double) and because we defined pseudo-tags that are
+ *     outside the range of legal Aldus-assigned tags.
+ * NB: tsize_t is int32 and not uint32 because some functions
+ *     return -1.
+ * NB: toff_t is not off_t for many reasons; TIFFs max out at
+ *     32-bit file offsets, and BigTIFF maxes out at 64-bit
+ *     offsets being the most important, and to ensure use of
+ *     a consistently unsigned type across architectures.
+ *     Prior to libtiff 4.0, this was an unsigned 32 bit type.
+ */
+/*
+ * this is the machine addressing size type, only it's signed, so make it
+ * int32 on 32bit machines, int64 on 64bit machines
+ */
+typedef TIFF_SSIZE_T tmsize_t;
+typedef uint64 toff_t;          /* file offset */
+/* the following are deprecated and should be replaced by their defining
+   counterparts */
+typedef uint32 ttag_t;          /* directory tag */
+typedef uint16 tdir_t;          /* directory index */
+typedef uint16 tsample_t;       /* sample number */
+typedef uint32 tstrile_t;       /* strip or tile number */
+typedef tstrile_t tstrip_t;     /* strip number */
+typedef tstrile_t ttile_t;      /* tile number */
+typedef tmsize_t tsize_t;       /* i/o size in bytes */
+typedef void* tdata_t;          /* image data ref */
+
+#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))
+#define __WIN32__
+#endif
+
+/*
+ * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c
+ * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c).
+ *
+ * By default tif_unix.c is assumed.
+ */
+
+#if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+#  if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO)
+#    define AVOID_WIN32_FILEIO
+#  endif
+#endif
+
+#if defined(USE_WIN32_FILEIO)
+# define VC_EXTRALEAN
+# include <windows.h>
+# ifdef __WIN32__
+DECLARE_HANDLE(thandle_t);     /* Win32 file handle */
+# else
+typedef HFILE thandle_t;       /* client data handle */
+# endif /* __WIN32__ */
+#else
+typedef void* thandle_t;       /* client data handle */
+#endif /* USE_WIN32_FILEIO */
+
+/*
+ * Flags to pass to TIFFPrintDirectory to control
+ * printing of data structures that are potentially
+ * very large.   Bit-or these flags to enable printing
+ * multiple items.
+ */
+#define TIFFPRINT_NONE	       0x0    /* no extra info */
+#define TIFFPRINT_STRIPS       0x1    /* strips/tiles info */
+#define TIFFPRINT_CURVES       0x2    /* color/gray response curves */
+#define TIFFPRINT_COLORMAP     0x4    /* colormap */
+#define TIFFPRINT_JPEGQTABLES  0x100  /* JPEG Q matrices */
+#define TIFFPRINT_JPEGACTABLES 0x200  /* JPEG AC tables */
+#define TIFFPRINT_JPEGDCTABLES 0x200  /* JPEG DC tables */
+
+/* 
+ * Colour conversion stuff
+ */
+
+/* reference white */
+#define D65_X0 (95.0470F)
+#define D65_Y0 (100.0F)
+#define D65_Z0 (108.8827F)
+
+#define D50_X0 (96.4250F)
+#define D50_Y0 (100.0F)
+#define D50_Z0 (82.4680F)
+
+/* Structure for holding information about a display device. */
+
+typedef unsigned char TIFFRGBValue;               /* 8-bit samples */
+
+typedef struct {
+	float d_mat[3][3];                        /* XYZ -> luminance matrix */
+	float d_YCR;                              /* Light o/p for reference white */
+	float d_YCG;
+	float d_YCB;
+	uint32 d_Vrwr;                            /* Pixel values for ref. white */
+	uint32 d_Vrwg;
+	uint32 d_Vrwb;
+	float d_Y0R;                              /* Residual light for black pixel */
+	float d_Y0G;
+	float d_Y0B;
+	float d_gammaR;                           /* Gamma values for the three guns */
+	float d_gammaG;
+	float d_gammaB;
+} TIFFDisplay;
+
+typedef struct {                                  /* YCbCr->RGB support */
+	TIFFRGBValue* clamptab;                   /* range clamping table */
+	int* Cr_r_tab;
+	int* Cb_b_tab;
+	int32* Cr_g_tab;
+	int32* Cb_g_tab;
+	int32* Y_tab;
+} TIFFYCbCrToRGB;
+
+typedef struct {                                  /* CIE Lab 1976->RGB support */
+	int range;                                /* Size of conversion table */
+#define CIELABTORGB_TABLE_RANGE 1500
+	float rstep, gstep, bstep;
+	float X0, Y0, Z0;                         /* Reference white point */
+	TIFFDisplay display;
+	float Yr2r[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yr to r */
+	float Yg2g[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yg to g */
+	float Yb2b[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yb to b */
+} TIFFCIELabToRGB;
+
+/*
+ * RGBA-style image support.
+ */
+typedef struct _TIFFRGBAImage TIFFRGBAImage;
+/*
+ * The image reading and conversion routines invoke
+ * ``put routines'' to copy/image/whatever tiles of
+ * raw image data.  A default set of routines are 
+ * provided to convert/copy raw image data to 8-bit
+ * packed ABGR format rasters.  Applications can supply
+ * alternate routines that unpack the data into a
+ * different format or, for example, unpack the data
+ * and draw the unpacked raster on the display.
+ */
+typedef void (*tileContigRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*);
+typedef void (*tileSeparateRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*, unsigned char*, unsigned char*, unsigned char*);
+/*
+ * RGBA-reader state.
+ */
+struct _TIFFRGBAImage {
+	TIFF* tif;                              /* image handle */
+	int stoponerr;                          /* stop on read error */
+	int isContig;                           /* data is packed/separate */
+	int alpha;                              /* type of alpha data present */
+	uint32 width;                           /* image width */
+	uint32 height;                          /* image height */
+	uint16 bitspersample;                   /* image bits/sample */
+	uint16 samplesperpixel;                 /* image samples/pixel */
+	uint16 orientation;                     /* image orientation */
+	uint16 req_orientation;                 /* requested orientation */
+	uint16 photometric;                     /* image photometric interp */
+	uint16* redcmap;                        /* colormap pallete */
+	uint16* greencmap;
+	uint16* bluecmap;
+	/* get image data routine */
+	int (*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
+	/* put decoded strip/tile */
+	union {
+	    void (*any)(TIFFRGBAImage*);
+	    tileContigRoutine contig;
+	    tileSeparateRoutine separate;
+	} put;
+	TIFFRGBValue* Map;                      /* sample mapping array */
+	uint32** BWmap;                         /* black&white map */
+	uint32** PALmap;                        /* palette image map */
+	TIFFYCbCrToRGB* ycbcr;                  /* YCbCr conversion state */
+	TIFFCIELabToRGB* cielab;                /* CIE L*a*b conversion state */
+
+	uint8* UaToAa;                          /* Unassociated alpha to associated alpha convertion LUT */
+	uint8* Bitdepth16To8;                   /* LUT for conversion from 16bit to 8bit values */
+
+	int row_offset;
+	int col_offset;
+};
+
+/*
+ * Macros for extracting components from the
+ * packed ABGR form returned by TIFFReadRGBAImage.
+ */
+#define TIFFGetR(abgr) ((abgr) & 0xff)
+#define TIFFGetG(abgr) (((abgr) >> 8) & 0xff)
+#define TIFFGetB(abgr) (((abgr) >> 16) & 0xff)
+#define TIFFGetA(abgr) (((abgr) >> 24) & 0xff)
+
+/*
+ * A CODEC is a software package that implements decoding,
+ * encoding, or decoding+encoding of a compression algorithm.
+ * The library provides a collection of builtin codecs.
+ * More codecs may be registered through calls to the library
+ * and/or the builtin implementations may be overridden.
+ */
+typedef int (*TIFFInitMethod)(TIFF*, int);
+typedef struct {
+	char* name;
+	uint16 scheme;
+	TIFFInitMethod init;
+} TIFFCodec;
+
+#include <stdio.h>
+#include <stdarg.h>
+
+/* share internal LogLuv conversion routines? */
+#ifndef LOGLUV_PUBLIC
+#define LOGLUV_PUBLIC 1
+#endif
+
+#if !defined(__GNUC__) && !defined(__attribute__)
+#  define __attribute__(x) /*nothing*/
+#endif
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+typedef void (*TIFFErrorHandler)(const char*, const char*, va_list);
+typedef void (*TIFFErrorHandlerExt)(thandle_t, const char*, const char*, va_list);
+typedef tmsize_t (*TIFFReadWriteProc)(thandle_t, void*, tmsize_t);
+typedef toff_t (*TIFFSeekProc)(thandle_t, toff_t, int);
+typedef int (*TIFFCloseProc)(thandle_t);
+typedef toff_t (*TIFFSizeProc)(thandle_t);
+typedef int (*TIFFMapFileProc)(thandle_t, void** base, toff_t* size);
+typedef void (*TIFFUnmapFileProc)(thandle_t, void* base, toff_t size);
+typedef void (*TIFFExtendProc)(TIFF*);
+
+extern const char* TIFFGetVersion(void);
+
+extern const TIFFCodec* TIFFFindCODEC(uint16);
+extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod);
+extern void TIFFUnRegisterCODEC(TIFFCodec*);
+extern int TIFFIsCODECConfigured(uint16);
+extern TIFFCodec* TIFFGetConfiguredCODECs(void);
+
+/*
+ * Auxiliary functions.
+ */
+
+extern void* _TIFFmalloc(tmsize_t s);
+extern void* _TIFFrealloc(void* p, tmsize_t s);
+extern void _TIFFmemset(void* p, int v, tmsize_t c);
+extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c);
+extern int _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c);
+extern void _TIFFfree(void* p);
+
+/*
+** Stuff, related to tag handling and creating custom tags.
+*/
+extern int TIFFGetTagListCount( TIFF * );
+extern uint32 TIFFGetTagListEntry( TIFF *, int tag_index );
+    
+#define TIFF_ANY       TIFF_NOTYPE     /* for field descriptor searching */
+#define TIFF_VARIABLE  -1              /* marker for variable length tags */
+#define TIFF_SPP       -2              /* marker for SamplesPerPixel tags */
+#define TIFF_VARIABLE2 -3              /* marker for uint32 var-length tags */
+
+#define FIELD_CUSTOM    65
+
+typedef struct _TIFFField TIFFField;
+typedef struct _TIFFFieldArray TIFFFieldArray;
+
+extern const TIFFField* TIFFFindField(TIFF *, uint32, TIFFDataType);
+extern const TIFFField* TIFFFieldWithTag(TIFF*, uint32);
+extern const TIFFField* TIFFFieldWithName(TIFF*, const char *);
+
+extern uint32 TIFFFieldTag(const TIFFField*);
+extern const char* TIFFFieldName(const TIFFField*);
+extern TIFFDataType TIFFFieldDataType(const TIFFField*);
+extern int TIFFFieldPassCount(const TIFFField*);
+extern int TIFFFieldReadCount(const TIFFField*);
+extern int TIFFFieldWriteCount(const TIFFField*);
+
+typedef int (*TIFFVSetMethod)(TIFF*, uint32, va_list);
+typedef int (*TIFFVGetMethod)(TIFF*, uint32, va_list);
+typedef void (*TIFFPrintMethod)(TIFF*, FILE*, long);
+
+typedef struct {
+    TIFFVSetMethod vsetfield; /* tag set routine */
+    TIFFVGetMethod vgetfield; /* tag get routine */
+    TIFFPrintMethod printdir; /* directory print routine */
+} TIFFTagMethods;
+
+extern  TIFFTagMethods *TIFFAccessTagMethods(TIFF *);
+extern  void *TIFFGetClientInfo(TIFF *, const char *);
+extern  void TIFFSetClientInfo(TIFF *, void *, const char *);
+
+extern void TIFFCleanup(TIFF* tif);
+extern void TIFFClose(TIFF* tif);
+extern int TIFFFlush(TIFF* tif);
+extern int TIFFFlushData(TIFF* tif);
+extern int TIFFGetField(TIFF* tif, uint32 tag, ...);
+extern int TIFFVGetField(TIFF* tif, uint32 tag, va_list ap);
+extern int TIFFGetFieldDefaulted(TIFF* tif, uint32 tag, ...);
+extern int TIFFVGetFieldDefaulted(TIFF* tif, uint32 tag, va_list ap);
+extern int TIFFReadDirectory(TIFF* tif);
+extern int TIFFReadCustomDirectory(TIFF* tif, toff_t diroff, const TIFFFieldArray* infoarray);
+extern int TIFFReadEXIFDirectory(TIFF* tif, toff_t diroff);
+extern uint64 TIFFScanlineSize64(TIFF* tif);
+extern tmsize_t TIFFScanlineSize(TIFF* tif);
+extern uint64 TIFFRasterScanlineSize64(TIFF* tif);
+extern tmsize_t TIFFRasterScanlineSize(TIFF* tif);
+extern uint64 TIFFStripSize64(TIFF* tif);
+extern tmsize_t TIFFStripSize(TIFF* tif);
+extern uint64 TIFFRawStripSize64(TIFF* tif, uint32 strip);
+extern tmsize_t TIFFRawStripSize(TIFF* tif, uint32 strip);
+extern uint64 TIFFVStripSize64(TIFF* tif, uint32 nrows);
+extern tmsize_t TIFFVStripSize(TIFF* tif, uint32 nrows);
+extern uint64 TIFFTileRowSize64(TIFF* tif);
+extern tmsize_t TIFFTileRowSize(TIFF* tif);
+extern uint64 TIFFTileSize64(TIFF* tif);
+extern tmsize_t TIFFTileSize(TIFF* tif);
+extern uint64 TIFFVTileSize64(TIFF* tif, uint32 nrows);
+extern tmsize_t TIFFVTileSize(TIFF* tif, uint32 nrows);
+extern uint32 TIFFDefaultStripSize(TIFF* tif, uint32 request);
+extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+extern int TIFFFileno(TIFF*);
+extern int TIFFSetFileno(TIFF*, int);
+extern thandle_t TIFFClientdata(TIFF*);
+extern thandle_t TIFFSetClientdata(TIFF*, thandle_t);
+extern int TIFFGetMode(TIFF*);
+extern int TIFFSetMode(TIFF*, int);
+extern int TIFFIsTiled(TIFF*);
+extern int TIFFIsByteSwapped(TIFF*);
+extern int TIFFIsUpSampled(TIFF*);
+extern int TIFFIsMSB2LSB(TIFF*);
+extern int TIFFIsBigEndian(TIFF*);
+extern TIFFReadWriteProc TIFFGetReadProc(TIFF*);
+extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*);
+extern TIFFSeekProc TIFFGetSeekProc(TIFF*);                                                          
+extern TIFFCloseProc TIFFGetCloseProc(TIFF*);
+extern TIFFSizeProc TIFFGetSizeProc(TIFF*);
+extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*);
+extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*);
+extern uint32 TIFFCurrentRow(TIFF*);
+extern uint16 TIFFCurrentDirectory(TIFF*);
+extern uint16 TIFFNumberOfDirectories(TIFF*);
+extern uint64 TIFFCurrentDirOffset(TIFF*);
+extern uint32 TIFFCurrentStrip(TIFF*);
+extern uint32 TIFFCurrentTile(TIFF* tif);
+extern int TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size);
+extern int TIFFWriteBufferSetup(TIFF* tif, void* bp, tmsize_t size);  
+extern int TIFFSetupStrips(TIFF *);
+extern int TIFFWriteCheck(TIFF*, int, const char *);
+extern void TIFFFreeDirectory(TIFF*);
+extern int TIFFCreateDirectory(TIFF*);
+extern int TIFFCreateCustomDirectory(TIFF*,const TIFFFieldArray*);
+extern int TIFFCreateEXIFDirectory(TIFF*);
+extern int TIFFLastDirectory(TIFF*);
+extern int TIFFSetDirectory(TIFF*, uint16);
+extern int TIFFSetSubDirectory(TIFF*, uint64);
+extern int TIFFUnlinkDirectory(TIFF*, uint16);
+extern int TIFFSetField(TIFF*, uint32, ...);
+extern int TIFFVSetField(TIFF*, uint32, va_list);
+extern int TIFFUnsetField(TIFF*, uint32);
+extern int TIFFWriteDirectory(TIFF *);
+extern int TIFFWriteCustomDirectory(TIFF *, uint64 *);
+extern int TIFFCheckpointDirectory(TIFF *);
+extern int TIFFRewriteDirectory(TIFF *);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0);
+extern int TIFFReadScanline(TIFF* tif, void* buf, uint32 row, uint16 sample = 0);
+extern int TIFFWriteScanline(TIFF* tif, void* buf, uint32 row, uint16 sample = 0);
+extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0);
+extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*,
+    int = ORIENTATION_BOTLEFT, int = 0);
+#else
+extern void TIFFPrintDirectory(TIFF*, FILE*, long);
+extern int TIFFReadScanline(TIFF* tif, void* buf, uint32 row, uint16 sample);
+extern int TIFFWriteScanline(TIFF* tif, void* buf, uint32 row, uint16 sample);
+extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int);
+extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int);
+#endif
+
+extern int TIFFReadRGBAStrip(TIFF*, uint32, uint32 * );
+extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * );
+extern int TIFFRGBAImageOK(TIFF*, char [1024]);
+extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]);
+extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32);
+extern void TIFFRGBAImageEnd(TIFFRGBAImage*);
+extern TIFF* TIFFOpen(const char*, const char*);
+# ifdef __WIN32__
+extern TIFF* TIFFOpenW(const wchar_t*, const char*);
+# endif /* __WIN32__ */
+extern TIFF* TIFFFdOpen(int, const char*, const char*);
+extern TIFF* TIFFClientOpen(const char*, const char*,
+	    thandle_t,
+	    TIFFReadWriteProc, TIFFReadWriteProc,
+	    TIFFSeekProc, TIFFCloseProc,
+	    TIFFSizeProc,
+	    TIFFMapFileProc, TIFFUnmapFileProc);
+extern const char* TIFFFileName(TIFF*);
+extern const char* TIFFSetFileName(TIFF*, const char *);
+extern void TIFFError(const char*, const char*, ...) __attribute__((__format__ (__printf__,2,3)));
+extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((__format__ (__printf__,3,4)));
+extern void TIFFWarning(const char*, const char*, ...) __attribute__((__format__ (__printf__,2,3)));
+extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((__format__ (__printf__,3,4)));
+extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
+extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
+extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);
+extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt);
+extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc);
+extern uint32 TIFFComputeTile(TIFF* tif, uint32 x, uint32 y, uint32 z, uint16 s);
+extern int TIFFCheckTile(TIFF* tif, uint32 x, uint32 y, uint32 z, uint16 s);
+extern uint32 TIFFNumberOfTiles(TIFF*);
+extern tmsize_t TIFFReadTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s);  
+extern tmsize_t TIFFWriteTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s);
+extern uint32 TIFFComputeStrip(TIFF*, uint32, uint16);
+extern uint32 TIFFNumberOfStrips(TIFF*);
+extern tmsize_t TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size);
+extern tmsize_t TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size);  
+extern tmsize_t TIFFReadEncodedTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size);  
+extern tmsize_t TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size);  
+extern tmsize_t TIFFWriteEncodedStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc);
+extern tmsize_t TIFFWriteRawStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc);  
+extern tmsize_t TIFFWriteEncodedTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc);  
+extern tmsize_t TIFFWriteRawTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc);  
+extern int TIFFDataWidth(TIFFDataType);    /* table of tag datatype widths */
+extern void TIFFSetWriteOffset(TIFF* tif, toff_t off);
+extern void TIFFSwabShort(uint16*);
+extern void TIFFSwabLong(uint32*);
+extern void TIFFSwabLong8(uint64*);
+extern void TIFFSwabFloat(float*);
+extern void TIFFSwabDouble(double*);
+extern void TIFFSwabArrayOfShort(uint16* wp, tmsize_t n);
+extern void TIFFSwabArrayOfTriples(uint8* tp, tmsize_t n);
+extern void TIFFSwabArrayOfLong(uint32* lp, tmsize_t n);
+extern void TIFFSwabArrayOfLong8(uint64* lp, tmsize_t n);
+extern void TIFFSwabArrayOfFloat(float* fp, tmsize_t n);
+extern void TIFFSwabArrayOfDouble(double* dp, tmsize_t n);
+extern void TIFFReverseBits(uint8* cp, tmsize_t n);
+extern const unsigned char* TIFFGetBitRevTable(int);
+
+#ifdef LOGLUV_PUBLIC
+#define U_NEU		0.210526316
+#define V_NEU		0.473684211
+#define UVSCALE		410.
+extern double LogL16toY(int);
+extern double LogL10toY(int);
+extern void XYZtoRGB24(float*, uint8*);
+extern int uv_decode(double*, double*, int);
+extern void LogLuv24toXYZ(uint32, float*);
+extern void LogLuv32toXYZ(uint32, float*);
+#if defined(c_plusplus) || defined(__cplusplus)
+extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER);
+extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER);
+extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER);
+extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER);
+extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER);
+#else
+extern int LogL16fromY(double, int);
+extern int LogL10fromY(double, int);
+extern int uv_encode(double, double, int);
+extern uint32 LogLuv24fromXYZ(float*, int);
+extern uint32 LogLuv32fromXYZ(float*, int);
+#endif
+#endif /* LOGLUV_PUBLIC */
+
+extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, const TIFFDisplay *, float*);
+extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32,
+    float *, float *, float *);
+extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float,
+    uint32 *, uint32 *, uint32 *);
+
+extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*);
+extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32,
+    uint32 *, uint32 *, uint32 *);
+
+/****************************************************************************
+ *               O B S O L E T E D    I N T E R F A C E S
+ *
+ * Don't use this stuff in your applications, it may be removed in the future
+ * libtiff versions.
+ ****************************************************************************/
+typedef	struct {
+	ttag_t	field_tag;		/* field's tag */
+	short	field_readcount;	/* read count/TIFF_VARIABLE/TIFF_SPP */
+	short	field_writecount;	/* write count/TIFF_VARIABLE */
+	TIFFDataType field_type;	/* type of associated data */
+        unsigned short field_bit;	/* bit in fieldsset bit vector */
+	unsigned char field_oktochange;	/* if true, can change while writing */
+	unsigned char field_passcount;	/* if true, pass dir count on set */
+	char	*field_name;		/* ASCII name */
+} TIFFFieldInfo;
+
+extern int TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32);
+        
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif /* _TIFFIO_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */
diff -Nru goldendict-1.5.0~git20131003/maclibs/include/tiff/tiffvers.h goldendict-1.5.0~git20150923/maclibs/include/tiff/tiffvers.h
--- goldendict-1.5.0~git20131003/maclibs/include/tiff/tiffvers.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/maclibs/include/tiff/tiffvers.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,9 @@
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.3\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+/*
+ * This define can be used in code that requires
+ * compilation-related definitions specific to a
+ * version or versions of the library.  Runtime
+ * version checking should be done based on the
+ * string returned by TIFFGetVersion.
+ */
+#define TIFFLIB_VERSION 20120922
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/maclibs/lib/libeb.dylib and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/maclibs/lib/libeb.dylib differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/maclibs/lib/liblzma.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/maclibs/lib/liblzma.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/maclibs/lib/libtiff.dylib and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/maclibs/lib/libtiff.dylib differ
diff -Nru goldendict-1.5.0~git20131003/macmouseover.hh goldendict-1.5.0~git20150923/macmouseover.hh
--- goldendict-1.5.0~git20131003/macmouseover.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/macmouseover.hh	2015-09-23 08:26:24.000000000 +0000
@@ -31,6 +31,8 @@
 
   /// Called from event loop callback
   void mouseMoved();
+
+  static bool isAXAPIEnabled();
   
 signals:
 
diff -Nru goldendict-1.5.0~git20131003/macmouseover.mm goldendict-1.5.0~git20150923/macmouseover.mm
--- goldendict-1.5.0~git20131003/macmouseover.mm	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/macmouseover.mm	2015-09-23 08:26:24.000000000 +0000
@@ -3,6 +3,7 @@
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSScreen.h>
 #include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/Foundation.h>
 
 const int mouseOverInterval = 300;
 
@@ -91,7 +92,7 @@
 void MacMouseOver::enableMouseOver()
 {
   mouseTimer.stop();
-  if( !AXAPIEnabled() )
+  if( !isAXAPIEnabled() )
     return;
   if( !tapRef )
     tapRef = CGEventTapCreate( kCGAnnotatedSessionEventTap, kCGHeadInsertEventTap,
@@ -121,7 +122,7 @@
     return;
   if( !pPref )
     return;
-  if( pPref->enableScanPopupModifiers && checkModifiersPressed( pPref->scanPopupModifiers ) )
+  if( !pPref->enableScanPopupModifiers || checkModifiersPressed( pPref->scanPopupModifiers ) )
     handlePosition();
 }
 
@@ -318,3 +319,11 @@
 
   emit instance().hovered( word, false );
 }
+
+bool MacMouseOver::isAXAPIEnabled()
+{
+  if( NSFoundationVersionNumber >= 1000 )  // MacOS 10.9+
+    return AXIsProcessTrusted();
+
+  return AXAPIEnabled();
+}
diff -Nru goldendict-1.5.0~git20131003/main.cc goldendict-1.5.0~git20150923/main.cc
--- goldendict-1.5.0~git20131003/main.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/main.cc	2015-09-23 08:26:24.000000000 +0000
@@ -31,7 +31,11 @@
 #include <QFile>
 #include <QString>
 
-QFile logFile;
+#include "gddebug.hh"
+
+#ifdef Q_OS_MAC
+#include "lionsupport.h"
+#endif
 
 void gdMessageHandler( QtMsgType type, const char *msg )
 {
@@ -83,7 +87,12 @@
 {
   #ifdef Q_OS_MAC
     setenv("LANG", "en_US.UTF-8", 1);
-    setenv("QT_GRAPHICSSYSTEM", "raster", 1);
+
+   // Check for retina display
+   if( LionSupport::isRetinaDisplay() )
+     QApplication::setGraphicsSystem( "native" );
+   else
+     QApplication::setGraphicsSystem( "raster" );
   #endif
 
   // The following clause fixes a race in the MinGW runtime where throwing
@@ -222,11 +231,15 @@
     logFile.remove();
     logFile.open( QFile::ReadWrite );
 
+    // Write UTF-8 BOM
+    QByteArray line;
+    line.append( 0xEF ).append( 0xBB ).append( 0xBF );
+    logFile.write( line );
+
     // Install message handler
     qInstallMsgHandler( gdMessageHandler );
   }
 
-
   if ( Config::isPortableVersion() )
   {
     // For portable version, hardcode some settings
@@ -284,8 +297,5 @@
 
   app.removeDataCommiter( m );
 
-  if( logFile.isOpen() )
-    logFile.close();
-
   return r;
 }
diff -Nru goldendict-1.5.0~git20131003/maintabwidget.cc goldendict-1.5.0~git20150923/maintabwidget.cc
--- goldendict-1.5.0~git20131003/maintabwidget.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/maintabwidget.cc	2015-09-23 08:26:24.000000000 +0000
@@ -55,7 +55,9 @@
   if( ev->type() == QEvent::MouseButtonDblClick )
   {
     QMouseEvent * mev = static_cast< QMouseEvent *>( ev );
-    if( tabBar()->tabAt( mev->pos() ) == -1 )
+    if( mev->y() >= tabBar()->rect().y()
+        && mev->y() <= tabBar()->rect().y() + tabBar()->rect().height()
+        && tabBar()->tabAt( mev->pos() ) == -1 )
     {
       emit doubleClicked();
       return true;
diff -Nru goldendict-1.5.0~git20131003/mainwindow.cc goldendict-1.5.0~git20150923/mainwindow.cc
--- goldendict-1.5.0~git20131003/mainwindow.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/mainwindow.cc	2015-09-23 08:26:24.000000000 +0000
@@ -1,12 +1,18 @@
 /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
+#ifndef NO_EPWING_SUPPORT
+#include "epwing_book.hh"
+#endif
+
 #include "mainwindow.hh"
 #include "editdictionaries.hh"
 #include "loaddictionaries.hh"
 #include "preferences.hh"
 #include "about.hh"
 #include "mruqmenu.hh"
+#include "gestures.hh"
+#include "dictheadwords.hh"
 #include <limits.h>
 #include <QDir>
 #include <QMessageBox>
@@ -17,7 +23,7 @@
 #include <QDesktopServices>
 #include <set>
 #include <map>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include <QDebug>
 #include <QTextStream>
 #include "dictinfo.hh"
@@ -28,9 +34,12 @@
 #include <QRunnable>
 #include <QThreadPool>
 #include <QSslConfiguration>
+#include <QDesktopWidget>
+#include "ui_authentication.h"
 
 #ifdef Q_OS_MAC
 #include "lionsupport.h"
+#include "macmouseover.hh"
 #endif
 
 #ifdef Q_OS_WIN32
@@ -38,6 +47,10 @@
 #include "mouseover_win32/GDDataTranfer.h"
 #include "wstring.hh"
 #include "wstring_qt.hh"
+
+#define gdStoreNormalGeometryEvent ( ( QEvent::Type )( QEvent::User + 1 ) )
+#define gdApplyNormalGeometryEvent ( ( QEvent::Type )( QEvent::User + 2 ) )
+
 #endif
 
 #ifdef Q_WS_X11
@@ -45,6 +58,8 @@
 #include <X11/Xlib.h>
 #endif
 
+#define MIN_THREAD_COUNT 4
+
 using std::set;
 using std::wstring;
 using std::map;
@@ -80,6 +95,8 @@
   useSmallIconsInToolbarsAction( tr( "Show Small Icons in &Toolbars" ), this ),
   toggleMenuBarAction( tr( "&Menubar" ), this ),
   switchExpandModeAction( this ),
+  focusHeadwordsDlgAction( this ),
+  focusArticleViewAction( this ),
   trayIconMenu( this ),
   addTab( this ),
   cfg( cfg_ ),
@@ -96,20 +113,36 @@
   wordListSelChanged( false )
 , wasMaximized( false )
 , blockUpdateWindowTitle( false )
+, headwordsDlg( 0 )
+, ftsIndexing( dictionaries )
+, ftsDlg( 0 )
+, helpWindow( 0 )
 #ifdef Q_OS_WIN32
 , gdAskMessage( 0xFFFFFFFF )
 #endif
 {
+  if( QThreadPool::globalInstance()->maxThreadCount() < MIN_THREAD_COUNT )
+    QThreadPool::globalInstance()->setMaxThreadCount( MIN_THREAD_COUNT );
+
 #ifndef QT_NO_OPENSSL
   QThreadPool::globalInstance()->start( new InitSSLRunnable );
 #endif
 
+#ifndef NO_EPWING_SUPPORT
+  Epwing::initialize();
+#endif
+
   applyQtStyleSheet( cfg.preferences.displayStyle, cfg.preferences.addonStyle );
 
   ui.setupUi( this );
 
   articleMaker.setCollapseParameters( cfg.preferences.collapseBigArticles, cfg.preferences.articleSizeLimit );
 
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  // Set own gesture recognizers
+  Gestures::registerRecognizers();
+#endif
+
   // use our own, cutsom statusbar
   setStatusBar(0);
   mainStatusBar = new MainStatusBar( this );
@@ -207,8 +240,11 @@
   buttonMenu->addSeparator();
   buttonMenu->addMenu( ui.menuFile );
   buttonMenu->addMenu( ui.menuView );
+  buttonMenu->addMenu( ui.menuSearch );
   buttonMenu->addMenu( ui.menu_Help );
 
+  ui.fullTextSearchAction->setEnabled( cfg.preferences.fts.enabled );
+
   menuButton = new QToolButton( navToolbar );
   menuButton->setPopupMode( QToolButton::InstantPopup );
   menuButton->setMenu( buttonMenu );
@@ -311,31 +347,21 @@
   connect( trayIconMenu.addAction( tr( "&Quit" ) ), SIGNAL( triggered() ),
            qApp, SLOT( quit() ) );
 
-  escAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
+  addGlobalAction( &escAction, SLOT( handleEsc() ) );
   escAction.setShortcut( QKeySequence( "Esc" ) );
-  connect( &escAction, SIGNAL( triggered() ),
-           this, SLOT( handleEsc() ) );
 
-  focusTranslateLineAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
+  addGlobalAction( &focusTranslateLineAction, SLOT( focusTranslateLine() ) );
   focusTranslateLineAction.setShortcuts( QList< QKeySequence >() <<
                                          QKeySequence( "Alt+D" ) <<
                                          QKeySequence( "Ctrl+L" ) );
 
-  connect( &focusTranslateLineAction, SIGNAL( triggered() ),
-           this, SLOT( focusTranslateLine() ) );
+  addGlobalAction( &focusHeadwordsDlgAction, SLOT( focusHeadwordsDialog() ) );
+  focusHeadwordsDlgAction.setShortcut( QKeySequence( "Ctrl+D" ) );
+
+  addGlobalAction( &focusArticleViewAction, SLOT( focusArticleView() ) );
+  focusArticleViewAction.setShortcut( QKeySequence( "Ctrl+N" ) );
 
-  ui.centralWidget->addAction( &escAction );
-  ui.dictsPane->addAction( &escAction );
-  ui.searchPaneWidget->addAction( &escAction );
-  ui.historyPane->addAction( &escAction );
-  groupList->addAction( &escAction );
-  translateBox->addAction( &escAction );
-
-  ui.centralWidget->addAction( &focusTranslateLineAction );
-  ui.dictsPane->addAction( &focusTranslateLineAction );
-  ui.searchPaneWidget->addAction( &focusTranslateLineAction );
-  ui.historyPane->addAction( &focusTranslateLineAction );
-  groupList->addAction( &focusTranslateLineAction );
+  addGlobalAction( ui.fullTextSearchAction, SLOT( showFullTextSearchDialog() ) );
 
   addTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
   addTabAction.setShortcut( QKeySequence( "Ctrl+T" ) );
@@ -494,6 +520,9 @@
   connect( &dictionaryBar, SIGNAL( showDictionaryInfo( QString const & ) ),
            this, SLOT( showDictionaryInfo( QString const & ) ) );
 
+  connect( &dictionaryBar, SIGNAL( showDictionaryHeadwords( QString const & ) ),
+           this, SLOT( showDictionaryHeadwords( QString const & ) ) );
+
   connect( &dictionaryBar, SIGNAL( openDictionaryFolder( QString const & ) ),
            this, SLOT( openDictionaryFolder( QString const & ) ) );
 
@@ -582,6 +611,8 @@
            this, SLOT( openConfigFolder() ) );
   connect( ui.about, SIGNAL( triggered() ),
            this, SLOT( showAbout() ) );
+  connect( ui.showReference, SIGNAL( triggered() ),
+           this, SLOT( showGDHelp() ) );
 
   connect( groupListInDock, SIGNAL( currentIndexChanged( QString const & ) ),
            this, SLOT( currentGroupChanged( QString const & ) ) );
@@ -644,13 +675,16 @@
   ui.historyList->installEventFilter( this );
 
 #ifdef Q_OS_WIN
-  QRect baseGeometry;
+  if( cfg.normalMainWindowGeometry.width() <= 0 )
+  {
+    QRect r = QApplication::desktop()->availableGeometry();
+    cfg.normalMainWindowGeometry.setRect( r.width() / 4, r.height() / 4, r.width() / 2, r.height() / 2 );
+  }
   if( cfg.maximizedMainWindowGeometry.width() > 0 )
   {
+    setGeometry( cfg.maximizedMainWindowGeometry );
     if ( cfg.mainWindowGeometry.size() )
       restoreGeometry( cfg.mainWindowGeometry );
-    baseGeometry = geometry();
-    setGeometry( cfg.maximizedMainWindowGeometry );
     if ( cfg.mainWindowState.size() )
       restoreState( cfg.mainWindowState, 1 );
     setWindowState( windowState() | Qt::WindowMaximized );
@@ -670,6 +704,12 @@
   applyProxySettings();
   applyWebSettings();
 
+  connect( &dictNetMgr, SIGNAL( proxyAuthenticationRequired( QNetworkProxy, QAuthenticator * ) ),
+           this, SLOT( proxyAuthentication( QNetworkProxy, QAuthenticator * ) ) );
+
+  connect( &articleNetMgr, SIGNAL( proxyAuthenticationRequired( QNetworkProxy, QAuthenticator * ) ),
+           this, SLOT( proxyAuthentication( QNetworkProxy, QAuthenticator * ) ) );
+
   makeDictionaries();
 
   // After we have dictionaries and groups, we can populate history
@@ -732,15 +772,6 @@
   {
     show();
     focusTranslateLine();
-#ifdef Q_OS_WIN
-    if( baseGeometry.width() > 0 )
-    {
-      hide();
-      setGeometry( baseGeometry );
-      showMaximized();
-      activateWindow();
-    }
-#endif
   }
 
   connect( &newReleaseCheckTimer, SIGNAL( timeout() ),
@@ -758,8 +789,8 @@
 
   updateStatusLine();
 
-#ifdef Q_OS_MACX
-  if( cfg.preferences.startWithScanPopupOn && !AXAPIEnabled() )
+#ifdef Q_OS_MAC
+  if( cfg.preferences.startWithScanPopupOn && !MacMouseOver::isAXAPIEnabled() )
       mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
                                       QPixmap( ":/icons/error.png" ) );
 #endif
@@ -773,7 +804,20 @@
   #endif
 #ifdef Q_OS_WIN32
   gdAskMessage = RegisterWindowMessage( GD_MESSAGE_NAME );
+  ( static_cast< QHotkeyApplication * >( qApp ) )->setMainWindow( this );
 #endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  ui.centralWidget->grabGesture( Gestures::GDPinchGestureType );
+  ui.centralWidget->grabGesture( Gestures::GDSwipeGestureType );
+#endif
+
+  if( layoutDirection() == Qt::RightToLeft )
+  {
+    // Adjust button icons for Right-To-Left layout
+    navBack->setIcon( QIcon( ":/icons/next.png" ) );
+    navForward->setIcon( QIcon( ":/icons/previous.png" ) );
+  }
 }
 
 void MainWindow::ctrlTabPressed()
@@ -824,6 +868,8 @@
     translateBoxToolBarAction->setVisible( true );
   }
 
+  translateLine->setToolTip( tr( "String to search in dictionaries. The wildcards '*', '?' and sets of symbols '[...]' are allowed.\nTo find '*', '?', '[', ']' symbols use '\\*', '\\?', '\\[', '\\]' respectively" ) );
+
   // reset the flag when switching UI modes
   wordListSelChanged = false;
 
@@ -867,9 +913,25 @@
 {
 #ifdef Q_OS_WIN
   if( isMaximized() )
+  {
     cfg.maximizedMainWindowGeometry = geometry();
+  }
   else
+  {
     cfg.maximizedMainWindowGeometry = QRect();
+    if( !isMinimized() )
+      cfg.normalMainWindowGeometry = geometry();
+  }
+#endif
+
+  closeHeadwordsDialog();
+
+  ftsIndexing.stopIndexing();
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  ui.centralWidget->ungrabGesture( Gestures::GDPinchGestureType );
+  ui.centralWidget->ungrabGesture( Gestures::GDSwipeGestureType );
+  Gestures::unregisterRecognizers();
 #endif
 
   // Close all tabs -- they should be destroyed before network managers
@@ -883,9 +945,32 @@
     delete w;
   }
 
+#ifndef NO_EPWING_SUPPORT
+  Epwing::finalize();
+#endif
+
   commitData();
+}
 
-  history.save();
+void MainWindow::addGlobalAction( QAction * action, const char * slot )
+{
+  action->setShortcutContext( Qt::WidgetWithChildrenShortcut );
+  connect( action, SIGNAL( triggered() ), this, slot );
+
+  ui.centralWidget->addAction( action );
+  ui.dictsPane->addAction( action );
+  ui.searchPaneWidget->addAction( action );
+  ui.historyPane->addAction( action );
+  groupList->addAction( action );
+  translateBox->addAction( action );
+}
+
+void MainWindow::addGlobalActionsToDialog( QDialog * dialog )
+{
+  dialog->addAction( &focusTranslateLineAction );
+  dialog->addAction( &focusHeadwordsDlgAction );
+  dialog->addAction( &focusArticleViewAction );
+  dialog->addAction( ui.fullTextSearchAction );
 }
 
 void MainWindow::commitData( QSessionManager & )
@@ -908,7 +993,16 @@
     scanPopup.reset();
 
     // Save any changes in last chosen groups etc
-    Config::save( cfg );
+    try
+    {
+      Config::save( cfg );
+    }
+    catch( std::exception & e )
+    {
+      gdWarning( "Configuration saving failed, error: %s\n", e.what() );
+    }
+
+    history.save();
   }
 }
 
@@ -1032,6 +1126,18 @@
 
 void MainWindow::applyProxySettings()
 {
+  if( cfg.preferences.proxyServer.enabled && cfg.preferences.proxyServer.useSystemProxy )
+  {
+    QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery();
+    if( !cfg.preferences.proxyServer.systemProxyUser.isEmpty() )
+    {
+      proxies.first().setUser( cfg.preferences.proxyServer.systemProxyUser );
+      proxies.first().setPassword( cfg.preferences.proxyServer.systemProxyPassword );
+    }
+    QNetworkProxy::setApplicationProxy( proxies.first() );
+    return;
+  }
+
   QNetworkProxy::ProxyType type = QNetworkProxy::NoProxy;
 
   if ( cfg.preferences.proxyServer.enabled )
@@ -1085,8 +1191,17 @@
 
   dictionariesUnmuted.clear();
 
+  ftsIndexing.stopIndexing();
+  ftsIndexing.clearDictionaries();
+
   loadDictionaries( this, isVisible(), cfg, dictionaries, dictNetMgr, false );
 
+  for( unsigned x = 0; x < dictionaries.size(); x++ )
+    dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
+
+  ftsIndexing.setDictionaries( dictionaries );
+  ftsIndexing.doIndexing();
+
   updateStatusLine();
   updateGroupList();
   makeScanPopup();
@@ -1352,6 +1467,7 @@
 {
   ArticleView * view = new ArticleView( this, articleNetMgr, dictionaries,
                                         groupInstances, false, cfg,
+                                        *ui.searchInPageAction,
                                         dictionaryBar.toggleViewAction(),
                                         groupList );
 
@@ -1373,8 +1489,8 @@
   connect( view, SIGNAL( typingEvent( QString const & ) ),
            this, SLOT( typingEvent( QString const & ) ) );
 
-  connect( view, SIGNAL( activeArticleChanged( const QString & ) ),
-           this, SLOT( activeArticleChanged( const QString & ) ) );
+  connect( view, SIGNAL( activeArticleChanged( ArticleView const *, const QString & ) ),
+           this, SLOT( activeArticleChanged( ArticleView const *, const QString & ) ) );
 
   connect( view, SIGNAL( statusBarMessage( QString const &, int, QPixmap const & ) ),
            this, SLOT( showStatusBarMessage( QString const &, int, QPixmap const & ) ) );
@@ -1398,6 +1514,10 @@
   connect( view, SIGNAL( storeResourceSavePath( QString const & ) ),
            this, SLOT( storeResourceSavePath( QString const & ) ) );
 
+  connect( view, SIGNAL( zoomIn()), this, SLOT( zoomin() ) );
+
+  connect( view, SIGNAL( zoomOut()), this, SLOT( zoomout() ) );
+
   view->setSelectionBySingleClick( cfg.preferences.selectWordBySingleClick );
 
   int index = cfg.preferences.newTabsOpenAfterCurrentOne ?
@@ -1503,7 +1623,7 @@
 
 void MainWindow::backClicked()
 {
-  DPRINTF( "Back\n" );
+  GD_DPRINTF( "Back\n" );
 
   ArticleView *view = getCurrentArticleView();
 
@@ -1512,7 +1632,7 @@
 
 void MainWindow::forwardClicked()
 {
-  DPRINTF( "Forward\n" );
+  GD_DPRINTF( "Forward\n" );
 
   ArticleView *view = getCurrentArticleView();
 
@@ -1561,6 +1681,9 @@
 
 void MainWindow::pageLoaded( ArticleView * view )
 {
+  if( view != getCurrentArticleView() )
+    return; // It was background action
+
   updateBackForwardButtons();
 
   updatePronounceAvailability();
@@ -1701,10 +1824,17 @@
 {
   hotkeyWrapper.reset(); // No hotkeys while we're editing dictionaries
   scanPopup.reset(); // No scan popup either. No one should use dictionaries.
+  closeHeadwordsDialog();
+  closeFullTextSearchDialog();
+
+  ftsIndexing.stopIndexing();
+  ftsIndexing.clearDictionaries();
 
   wordFinder.clear();
   dictionariesUnmuted.clear();
 
+  hideGDHelp();
+
   { // Limit existence of newCfg
 
   Config::Class newCfg = cfg;
@@ -1713,6 +1843,9 @@
   connect( &dicts, SIGNAL( showDictionaryInfo( QString const & ) ),
            this, SLOT( showDictionaryInfo( QString const & ) ) );
 
+  connect( &dicts, SIGNAL( showDictionaryHeadwords( QString const & ) ),
+           this, SLOT( showDictionaryHeadwords( QString const & ) ) );
+
   if ( editDictionaryGroup != Instances::Group::NoGroupId )
     dicts.editGroup( editDictionaryGroup );
 
@@ -1749,6 +1882,12 @@
 
   makeScanPopup();
   installHotKeys();
+
+  for( unsigned x = 0; x < dictionaries.size(); x++ )
+    dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
+
+  ftsIndexing.setDictionaries( dictionaries );
+  ftsIndexing.doIndexing();
 }
 
 void MainWindow::editCurrentGroup()
@@ -1760,8 +1899,15 @@
 {
   hotkeyWrapper.reset(); // So we could use the keys it hooks
   scanPopup.reset(); // No scan popup either. No one should use dictionaries.
+  closeHeadwordsDialog();
+  closeFullTextSearchDialog();
+
+  ftsIndexing.stopIndexing();
+  ftsIndexing.clearDictionaries();
 
-  Preferences preferences( this, cfg.preferences );
+  Preferences preferences( this, cfg );
+
+  hideGDHelp();
 
   preferences.show();
 
@@ -1771,10 +1917,24 @@
 
     // These parameters are not set in dialog
     p.zoomFactor = cfg.preferences.zoomFactor;
+    p.helpZoomFactor = cfg.preferences.helpZoomFactor;
     p.wordsZoomLevel = cfg.preferences.wordsZoomLevel;
     p.hideMenubar = cfg.preferences.hideMenubar;
     p.searchInDock = cfg.preferences.searchInDock;
     p.alwaysOnTop = cfg.preferences.alwaysOnTop;
+#ifndef Q_WS_X11
+    p.trackClipboardChanges = cfg.preferences.trackClipboardChanges;
+#endif
+    p.proxyServer.systemProxyUser = cfg.preferences.proxyServer.systemProxyUser;
+    p.proxyServer.systemProxyPassword = cfg.preferences.proxyServer.systemProxyPassword;
+
+    p.fts.dialogGeometry = cfg.preferences.fts.dialogGeometry;
+    p.fts.matchCase = cfg.preferences.fts.matchCase;
+    p.fts.maxArticlesPerDictionary = cfg.preferences.fts.maxArticlesPerDictionary;
+    p.fts.maxDistanceBetweenWords = cfg.preferences.fts.maxDistanceBetweenWords;
+    p.fts.searchMode = cfg.preferences.fts.searchMode;
+    p.fts.useMaxArticlesPerDictionary = cfg.preferences.fts.useMaxArticlesPerDictionary;
+    p.fts.useMaxDistanceBetweenWords = cfg.preferences.fts.useMaxDistanceBetweenWords;
 
     bool needReload = false;
 
@@ -1800,6 +1960,10 @@
       needReload = false;
     }
 
+    // See if we need to change help language
+    if( cfg.preferences.helpLanguage != p.helpLanguage )
+      closeGDHelp();
+
     for( int x = 0; x < ui.tabWidget->count(); ++x )
     {
       ArticleView & view =
@@ -1838,11 +2002,19 @@
     history.setMaxSize( cfg.preferences.maxStringsInHistory );
     ui.historyPaneWidget->updateHistoryCounts();
 
+    for( unsigned x = 0; x < dictionaries.size(); x++ )
+      dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
+
+    ui.fullTextSearchAction->setEnabled( cfg.preferences.fts.enabled );
+
     Config::save( cfg );
   }
 
   makeScanPopup();
   installHotKeys();
+
+  ftsIndexing.setDictionaries( dictionaries );
+  ftsIndexing.doIndexing();
 }
 
 void MainWindow::currentGroupChanged( QString const & )
@@ -1876,6 +2048,9 @@
   translateInputFinished( false );
 
   updateCurrentGroupProperty();
+
+  if( ftsDlg )
+    ftsDlg->setCurrentGroup( cfg.lastMainGroupId );
 }
 
 void MainWindow::updateCurrentGroupProperty()
@@ -1937,9 +2112,9 @@
   wordFinder.prefixMatch( req, getActiveDicts() );
 }
 
-void MainWindow::translateInputFinished( bool checkModifiers )
+void MainWindow::translateInputFinished( bool checkModifiers, QString const & dictID )
 {
-  QString word = translateLine->text();
+  QString word = Folding::unescapeWildcardSymbols( translateLine->text() );
 
   if ( word.size() )
   {
@@ -1947,7 +2122,7 @@
     if ( checkModifiers && ( mods & (Qt::ControlModifier | Qt::ShiftModifier) ) )
       addNewTab();
 
-    showTranslationFor( word );
+    showTranslationFor( word, 0, dictID );
 
     if ( cfg.preferences.searchInDock )
     {
@@ -2022,12 +2197,32 @@
 
 bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
 {
-  if ( ev->type() == QEvent::ShortcutOverride ) {
+#ifdef Q_OS_WIN
+  if( obj == this && ev->type() == gdStoreNormalGeometryEvent )
+  {
+    if( !isMaximized() && !isMinimized() && !isFullScreen() )
+      cfg.normalMainWindowGeometry = normalGeometry();
+    ev->accept();
+    return true;
+  }
+
+  if( obj == this && ev->type() == gdApplyNormalGeometryEvent )
+  {
+    if( !isMaximized() && !isMinimized() && !isFullScreen() )
+      setGeometry( cfg.normalMainWindowGeometry );
+    ev->accept();
+    return true;
+  }
+#endif
+  if ( ev->type() == QEvent::ShortcutOverride
+       || ev->type() == QEvent::KeyPress )
+  {
     // Handle Ctrl+H to show the History Pane.
     QKeyEvent * ke = static_cast<QKeyEvent*>( ev );
     if ( ke->key() == Qt::Key_H && ke->modifiers() == Qt::ControlModifier )
     {
-      on_showHideHistory_triggered();
+      if( ev->type() == QEvent::KeyPress )
+        on_showHideHistory_triggered();
       ev->accept();
       return true;
     }
@@ -2044,6 +2239,13 @@
   // when the main window is moved or resized, hide the word list suggestions
   if ( obj == this && ( ev->type() == QEvent::Move || ev->type() == QEvent::Resize ) )
   {
+#ifdef Q_OS_WIN
+    if( !isMaximized() && !isMinimized() && !isFullScreen() && gdAskMessage != 0xFFFFFFFF )
+    {
+      QEvent *ev = new QEvent( gdStoreNormalGeometryEvent );
+      qApp->postEvent( this, ev );
+    }
+#endif
     if ( !cfg.preferences.searchInDock )
     {
         translateBox->setPopupEnabled( false );
@@ -2055,6 +2257,14 @@
   {
     QWindowStateChangeEvent *stev = static_cast< QWindowStateChangeEvent *>( ev );
     wasMaximized = ( stev->oldState() == Qt::WindowMaximized && isMinimized() );
+
+#ifdef Q_OS_WIN
+    if( stev->oldState() == Qt::WindowMaximized && !isMinimized() && cfg.normalMainWindowGeometry.width() > 0 )
+    {
+      QEvent *ev = new QEvent( gdApplyNormalGeometryEvent );
+      qApp->postEvent( this, ev );
+    }
+#endif
   }
 
   if ( ev->type() == QEvent::MouseButtonPress ) {
@@ -2267,8 +2477,11 @@
       showDefinition( word, group, fromArticle, contexts );
 }
 
-void MainWindow::activeArticleChanged( QString const & id )
+void MainWindow::activeArticleChanged( ArticleView const * view, QString const & id )
 {
+  if( view != getCurrentArticleView() )
+    return; // It was background action
+
   // select the row with the corresponding id
   for (int i = 0; i < ui.dictsList->count(); ++i) {
     QListWidgetItem * w = ui.dictsList->item( i );
@@ -2323,9 +2536,9 @@
   history.enableAdd( false );
 
   if ( cfg.preferences.searchInDock )
-    translateLine->setText( word );
+    translateLine->setText( Folding::escapeWildcardSymbols( word ) );
   else
-    translateBox->setText( word, false );
+    translateBox->setText( Folding::escapeWildcardSymbols( word ), false );
 
   showTranslationFor( word );
 
@@ -2333,7 +2546,8 @@
 }
 
 void MainWindow::showTranslationFor( QString const & inWord,
-                                     unsigned inGroup )
+                                     unsigned inGroup,
+                                     QString const & dictID )
 {
   ArticleView *view = getCurrentArticleView();
 
@@ -2343,7 +2557,7 @@
                    ( groupInstances.empty() ? 0 :
                         groupInstances[ groupList->currentIndex() ].id );
 
-  view->showDefinition( inWord, group );
+  view->showDefinition( inWord, group, dictID );
 
   updatePronounceAvailability();
   updateFoundInDictsList();
@@ -2443,6 +2657,27 @@
   //ui.tabWidget->setTabText( ui.tabWidget->indexOf(ui.tab), inWord.trimmed() );
 }
 
+void MainWindow::showTranslationFor( QString const & inWord,
+                                     QStringList const & dictIDs,
+                                     QRegExp const & searchRegExp )
+{
+  ArticleView *view = getCurrentArticleView();
+
+  navPronounce->setEnabled( false );
+
+  view->showDefinition( inWord, dictIDs, searchRegExp,
+                        groupInstances[ groupList->currentIndex() ].id );
+
+  updatePronounceAvailability();
+  updateFoundInDictsList();
+
+  // Add to history
+
+  addWordToHistory( inWord );
+
+  updateBackForwardButtons();
+}
+
 #ifdef Q_WS_X11
 void MainWindow::toggleMainWindow( bool onlyShow, bool byIconClick )
 #else
@@ -2484,10 +2719,25 @@
       hide();
     else
       showMinimized();
+
+    if( headwordsDlg )
+      headwordsDlg->hide();
+
+    if( ftsDlg )
+      ftsDlg->hide();
+
+    if( helpWindow )
+      helpWindow->hide();
   }
 
   if ( shown )
   {
+    if( headwordsDlg )
+      headwordsDlg->show();
+
+    if( ftsDlg )
+      ftsDlg->show();
+
     focusTranslateLine();
 #ifdef Q_WS_X11
     Window wh = 0;
@@ -2654,7 +2904,7 @@
     // Failed -- reschedule to check in two hours
     newReleaseCheckTimer.start( 2 * 60 * 60 * 1000 );
 
-    DPRINTF( "Failed to check program version, retry in two hours\n" );
+    GD_DPRINTF( "Failed to check program version, retry in two hours\n" );
   }
   else
   {
@@ -2665,8 +2915,8 @@
 
     Config::save( cfg );
 
-    DPRINTF( "Program version's check successful, current version is %ls\n",
-            latestVersion.toStdWString().c_str() );
+    GD_DPRINTF( "Program version's check successful, current version is %ls\n",
+                latestVersion.toStdWString().c_str() );
   }
 
   if ( success && latestVersion > PROGRAM_VERSION && latestVersion != cfg.skippedRelease )
@@ -2730,8 +2980,8 @@
     if ( on )
     {
       scanPopup->enableScanning();
-#ifdef Q_OS_MACX
-      if( !AXAPIEnabled() )
+#ifdef Q_OS_MAC
+      if( !MacMouseOver::isAXAPIEnabled() )
           mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
                                           QPixmap( ":/icons/error.png" ) );
 #endif
@@ -2981,7 +3231,13 @@
 {
   ArticleView *view = getCurrentArticleView();
 
-  QString fileName = view->getTitle() + ".html";
+  QString fileName = view->getTitle().simplified();
+
+  // Replace reserved filename characters
+  QRegExp rxName( "[/\\\\\\?\\*:\\|<>]" );
+  fileName.replace( rxName, "_" );
+
+  fileName += ".html";
   QString savePath;
 
   if ( cfg.articleSavePath.isEmpty() )
@@ -3023,6 +3279,19 @@
       QFileInfo fi( fileName );
       cfg.articleSavePath = QDir::toNativeSeparators( fi.absoluteDir().absolutePath() );
 
+      // Convert internal links
+
+      QRegExp rx3( "href=\"(bword:|gdlookup://localhost/)([^\"]+)\"" );
+      int pos = 0;
+      while ( ( pos = rx3.indexIn( html, pos ) ) != -1 )
+      {
+        QString name = QUrl::fromPercentEncoding( rx3.cap( 2 ).simplified().toLatin1() );
+        name.replace( rxName, "_" );
+        name = QString( "href=\"" ) + QUrl::toPercentEncoding( name ) + ".html\"";
+        html.replace( pos, rx3.cap().length(), name );
+        pos += name.length();
+      }
+
       if ( complete )
       {
         QString folder = fi.absoluteDir().absolutePath() + "/" + fi.baseName() + "_files";
@@ -3072,6 +3341,11 @@
 {
   hotkeyWrapper.reset(); // No hotkeys while we're editing dictionaries
   scanPopup.reset(); // No scan popup either. No one should use dictionaries.
+  closeHeadwordsDialog();
+  closeFullTextSearchDialog();
+
+  ftsIndexing.stopIndexing();
+  ftsIndexing.clearDictionaries();
 
   groupInstances.clear(); // Release all the dictionaries they hold
   dictionaries.clear();
@@ -3080,6 +3354,12 @@
 
   loadDictionaries( this, true, cfg, dictionaries, dictNetMgr );
 
+  for( unsigned x = 0; x < dictionaries.size(); x++ )
+    dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
+
+  ftsIndexing.setDictionaries( dictionaries );
+  ftsIndexing.doIndexing();
+
   updateGroupList();
 
   makeScanPopup();
@@ -3253,8 +3533,15 @@
 void MainWindow::wordReceived( const QString & word)
 {
     toggleMainWindow( true );
-    translateLine->setText( word );
-    translateInputFinished();
+    translateLine->setText( Folding::escapeWildcardSymbols( word ) );
+    translateInputFinished( false );
+}
+
+void MainWindow::headwordReceived( const QString & word, const QString & ID )
+{
+    toggleMainWindow( true );
+    translateLine->setText( Folding::escapeWildcardSymbols( word ) );
+    translateInputFinished( false, QString( "gdfrom-" )+ ID );
 }
 
 void MainWindow::updateHistoryMenu()
@@ -3472,6 +3759,14 @@
 
 void MainWindow::showDictionaryInfo( const QString & id )
 {
+  QWidget * owner = 0;
+
+  if( sender()->objectName().compare( "EditDictionaries" ) == 0 )
+    owner = qobject_cast< QWidget * >( sender() );
+
+  if( owner == 0 )
+    owner = this;
+
   for( unsigned x = 0; x < dictionaries.size(); x++ )
   {
     if( dictionaries[ x ]->getId() == id.toUtf8().data() )
@@ -3488,12 +3783,90 @@
       {
         editDictionary( dictionaries[x].get() );
       }
+      else if( result == DictInfo::SHOW_HEADWORDS )
+      {
+        showDictionaryHeadwords( owner, dictionaries[x].get() );
+      }
 
       break;
     }
   }
 }
 
+void MainWindow::showDictionaryHeadwords( const QString & id )
+{
+  QWidget * owner = 0;
+
+  if( sender()->objectName().compare( "EditDictionaries" ) == 0 )
+    owner = qobject_cast< QWidget * >( sender() );
+
+  if( owner == 0 )
+    owner = this;
+
+  for( unsigned x = 0; x < dictionaries.size(); x++ )
+  {
+    if( dictionaries[ x ]->getId() == id.toUtf8().data() )
+    {
+      showDictionaryHeadwords( owner, dictionaries[ x ].get() );
+      break;
+    }
+  }
+}
+
+void MainWindow::showDictionaryHeadwords( QWidget * owner, Dictionary::Class * dict )
+{
+  if( owner && owner != this )
+  {
+    DictHeadwords headwords( owner, cfg, dict );
+    headwords.exec();
+    return;
+  }
+
+  if( headwordsDlg == 0 )
+  {
+    headwordsDlg = new DictHeadwords( this, cfg, dict );
+    addGlobalActionsToDialog( headwordsDlg );
+    connect( headwordsDlg, SIGNAL( headwordSelected( QString, QString ) ),
+             this, SLOT( headwordReceived( QString, QString ) ) );
+    connect( headwordsDlg, SIGNAL( closeDialog() ),
+             this, SLOT( closeHeadwordsDialog() ) );
+  }
+  else
+    headwordsDlg->setup( dict );
+
+  headwordsDlg->show();
+}
+
+void MainWindow::closeHeadwordsDialog()
+{
+  if( headwordsDlg )
+  {
+    delete headwordsDlg;
+    headwordsDlg = NULL;
+  }
+}
+
+void MainWindow::focusHeadwordsDialog()
+{
+  if( headwordsDlg )
+  {
+    headwordsDlg->activateWindow();
+    if ( ftsDlg )
+      ftsDlg->lower();
+  }
+}
+
+void MainWindow::focusArticleView()
+{
+  ArticleView * view = getCurrentArticleView();
+  if ( view )
+  {
+    if ( !isActiveWindow() )
+      activateWindow();
+    view->focus();
+  }
+}
+
 void MainWindow::editDictionary( Dictionary::Class * dict )
 {
   QString dictFilename = dict->getMainFilename();
@@ -3595,6 +3968,10 @@
       QMenu menu( ui.dictsList );
       QAction * infoAction = menu.addAction( tr( "Dictionary info" ) );
 
+      QAction * headwordsAction = NULL;
+      if( pDict->getWordCount() > 0 )
+        headwordsAction = menu.addAction( tr( "Dictionary headwords" ) );
+
       QAction * openDictFolderAction = menu.addAction( tr( "Open dictionary folder" ) );
 
       QAction * editAction = NULL;
@@ -3614,6 +3991,15 @@
           scanPopup.get()->blockSignals( false );
       }
       else
+      if( result && result == headwordsAction )
+      {
+        if ( scanPopup )
+          scanPopup.get()->blockSignals( true );
+        showDictionaryHeadwords( this, pDict );
+        if ( scanPopup )
+          scanPopup.get()->blockSignals( false );
+      }
+      else
       if( result && result == openDictFolderAction )
       {
         openDictionaryFolder( id );
@@ -3638,13 +4024,163 @@
   cfg.resourceSavePath = newPath;
 }
 
+void MainWindow::proxyAuthentication( const QNetworkProxy &,
+                                      QAuthenticator * authenticator )
+{
+  QNetworkProxy proxy = QNetworkProxy::applicationProxy();
+
+  QString * userStr, * passwordStr;
+  if( cfg.preferences.proxyServer.useSystemProxy )
+  {
+    userStr = &cfg.preferences.proxyServer.systemProxyUser;
+    passwordStr = &cfg.preferences.proxyServer.systemProxyPassword;
+  }
+  else
+  {
+    userStr = &cfg.preferences.proxyServer.user;
+    passwordStr = &cfg.preferences.proxyServer.password;
+  }
+
+  if( proxy.user().isEmpty() && !userStr->isEmpty() )
+  {
+    authenticator->setUser( *userStr );
+    authenticator->setPassword( *passwordStr );
+
+    proxy.setUser( *userStr );
+    proxy.setPassword( *passwordStr );
+    QNetworkProxy::setApplicationProxy( proxy );
+  }
+  else
+  {
+    QDialog dlg;
+    Ui::Dialog ui;
+    ui.setupUi( &dlg );
+    dlg.adjustSize();
+
+    ui.userEdit->setText( *userStr );
+    ui.passwordEdit->setText( *passwordStr );
+
+    if ( dlg.exec() == QDialog::Accepted )
+    {
+      *userStr = ui.userEdit->text();
+      *passwordStr = ui.passwordEdit->text();
+
+      authenticator->setUser( *userStr );
+      authenticator->setPassword( *passwordStr );
+
+      proxy.setUser( *userStr );
+      proxy.setPassword( *passwordStr );
+      QNetworkProxy::setApplicationProxy( proxy );
+    }
+  }
+}
+
+void MainWindow::showFullTextSearchDialog()
+{
+  if( !ftsDlg )
+  {
+    ftsDlg = new FTS::FullTextSearchDialog( this, cfg, dictionaries, groupInstances, ftsIndexing );
+    addGlobalActionsToDialog( ftsDlg );
+
+    connect( ftsDlg, SIGNAL( showTranslationFor( QString, QStringList, QRegExp ) ),
+             this, SLOT( showTranslationFor( QString, QStringList, QRegExp ) ) );
+    connect( ftsDlg, SIGNAL( closeDialog() ),
+             this, SLOT( closeFullTextSearchDialog() ), Qt::QueuedConnection );
+    connect( &configEvents, SIGNAL( mutedDictionariesChanged() ),
+             ftsDlg, SLOT( updateDictionaries() ) );
+
+    unsigned group = groupInstances.empty() ? 0
+                                            : groupInstances[ groupList->currentIndex() ].id;
+    ftsDlg->setCurrentGroup( group );
+  }
+
+  if( !ftsDlg ->isVisible() )
+    ftsDlg->show();
+  else
+  {
+    ftsDlg->activateWindow();
+    if ( headwordsDlg )
+      headwordsDlg->lower();
+  }
+}
+
+void MainWindow::closeFullTextSearchDialog()
+{
+  if( ftsDlg )
+  {
+    ftsDlg->stopSearch();
+    delete ftsDlg;
+    ftsDlg = 0;
+  }
+}
+
+void MainWindow::showGDHelp()
+{
+  if( !helpWindow )
+  {
+    helpWindow = new Help::HelpWindow( this, cfg );
+
+    if( helpWindow->getHelpEngine() )
+    {
+      connect( helpWindow, SIGNAL( needClose() ), this, SLOT( hideGDHelp() ) );
+      helpWindow->showHelpFor( "Content" );
+      helpWindow->show();
+    }
+    else
+    {
+      delete helpWindow;
+      helpWindow = 0;
+    }
+  }
+  else
+  {
+    helpWindow->show();
+    helpWindow->activateWindow();
+  }
+}
+
+void MainWindow::hideGDHelp()
+{
+  if( helpWindow )
+    helpWindow->hide();
+}
+
+void MainWindow::showGDHelpForID( QString const & id )
+{
+  if( !helpWindow )
+    showGDHelp();
+
+  if( helpWindow )
+  {
+    helpWindow->showHelpFor( id );
+    if( !helpWindow->isVisible() )
+    {
+      helpWindow->show();
+      helpWindow->activateWindow();
+    }
+  }
+}
+
+void MainWindow::closeGDHelp()
+{
+  if( helpWindow )
+  {
+    delete helpWindow;
+    helpWindow = 0;
+  }
+}
+
 #ifdef Q_OS_WIN32
 
-bool MainWindow::winEvent( MSG * message, long * result )
+bool MainWindow::handleGDMessage( MSG * message, long * result )
 {
   if( message->message != gdAskMessage )
     return false;
   *result = 0;
+
+  if( !isGoldenDictWindow( message->hwnd ) )
+    return true;
+
   ArticleView * view = getCurrentArticleView();
   if( !view )
     return true;
@@ -3654,12 +4190,6 @@
   QString str = view->wordAtPoint( lpdata->Pt.x, lpdata->Pt.y );
 
   memset( lpdata->cwData, 0, lpdata->dwMaxLength * sizeof( WCHAR ) );
-  if( str.isRightToLeft() )
-  {
-    gd::wstring wstr = gd::toWString( str );
-    wstr.assign( wstr.rbegin(), wstr.rend() );
-    str = gd::toQString( wstr );
-  }
   str.truncate( lpdata->dwMaxLength - 1 );
   str.toWCharArray( lpdata->cwData );
 
@@ -3669,7 +4199,7 @@
 
 bool MainWindow::isGoldenDictWindow( HWND hwnd )
 {
-    return hwnd == (HWND)winId();
+  return hwnd == winId() || hwnd == ui.centralWidget->winId();
 }
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/mainwindow.hh goldendict-1.5.0~git20150923/mainwindow.hh
--- goldendict-1.5.0~git20131003/mainwindow.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/mainwindow.hh	2015-09-23 08:26:24.000000000 +0000
@@ -27,6 +27,9 @@
 #include "mruqmenu.hh"
 #include "translatebox.hh"
 #include "wordlist.hh"
+#include "dictheadwords.hh"
+#include "fulltextsearch.hh"
+#include "helpwindow.hh"
 
 #ifdef Q_WS_X11
 #include <fixx11h.h>
@@ -66,14 +69,20 @@
 
   virtual void commitData( QSessionManager & );
 
+  void showGDHelpForID( QString const & id );
+  void closeGDHelp();
+
 public slots:
 
   void messageFromAnotherInstanceReceived( QString const & );
   void showStatusBarMessage ( QString const &, int, QPixmap const & );
   void wordReceived( QString const & );
+  void headwordReceived( QString const &, QString const & );
   void setExpandMode( bool expand );
 
 private:
+  void addGlobalAction( QAction * action, const char * slot );
+  void addGlobalActionsToDialog( QDialog * dialog );
 
   void commitData();
   bool commitDataCompleted;
@@ -105,7 +114,8 @@
   QAction escAction, focusTranslateLineAction, addTabAction, closeCurrentTabAction,
           closeAllTabAction, closeRestTabAction,
           switchToNextTabAction, switchToPrevTabAction,
-          showDictBarNamesAction, useSmallIconsInToolbarsAction, toggleMenuBarAction, switchExpandModeAction;
+          showDictBarNamesAction, useSmallIconsInToolbarsAction, toggleMenuBarAction,
+          switchExpandModeAction, focusHeadwordsDlgAction, focusArticleViewAction;
   QToolBar * navToolbar;
   MainStatusBar * mainStatusBar;
   QAction * navBack, * navForward, * navPronounce, * enableScanPopup;
@@ -157,6 +167,14 @@
 
   QPrinter & getPrinter(); // Creates a printer if it's not there and returns it
 
+  DictHeadwords * headwordsDlg;
+
+  FTS::FtsIndexing ftsIndexing;
+
+  FTS::FullTextSearchDialog * ftsDlg;
+
+  Help::HelpWindow * helpWindow;
+
   /// Applies the qt's stylesheet, given the style's name.
   void applyQtStyleSheet( QString const & displayStyle, QString const & addonStyle );
 
@@ -219,6 +237,8 @@
 
   void fillWordListFromHistory();
 
+  void showDictionaryHeadwords( QWidget * owner, Dictionary::Class * dict );
+
 private slots:
 
   void hotKeyActivated( int );
@@ -243,6 +263,8 @@
 
   void showDictionaryInfo( QString const & id );
 
+  void showDictionaryHeadwords( QString const & id );
+
   void openDictionaryFolder( QString const & id );
 
   void editDictionary ( Dictionary::Class * dict );
@@ -308,7 +330,7 @@
 
   void currentGroupChanged( QString const & );
   void translateInputChanged( QString const & );
-  void translateInputFinished( bool checkModifiers = true );
+  void translateInputFinished( bool checkModifiers = true, QString const & dictID = QString() );
 
   /// Closes any opened search in the article view, and focuses the translateLine/close main window to tray.
   void handleEsc();
@@ -339,11 +361,15 @@
                                ArticleView::Contexts const & contexts );
   void typingEvent( QString const & );
 
-  void activeArticleChanged( QString const & id );
+  void activeArticleChanged( ArticleView const *, QString const & id );
 
   void mutedDictionariesChanged();
 
-  void showTranslationFor( QString const &, unsigned inGroup = 0 );
+  void showTranslationFor( QString const &, unsigned inGroup = 0,
+                           QString const & dictID = QString() );
+
+  void showTranslationFor( QString const &, QStringList const & dictIDs,
+                           QRegExp const & searchRegExp );
 
   void showHistoryItem( QString const & );
 
@@ -398,6 +424,20 @@
 
   void storeResourceSavePath( QString const & );
 
+  void closeHeadwordsDialog();
+
+  void focusHeadwordsDialog();
+
+  void focusArticleView();
+
+  void proxyAuthentication( const QNetworkProxy & proxy, QAuthenticator * authenticator );
+
+  void showFullTextSearchDialog();
+  void closeFullTextSearchDialog();
+
+  void showGDHelp();
+  void hideGDHelp();
+
 signals:
   /// Set optional parts expand mode for all tabs
   void setExpandOptionalParts( bool expand );
@@ -409,7 +449,8 @@
   /// For receiving message from scan libraries
 protected:
   unsigned gdAskMessage;
-  bool winEvent( MSG * message, long * result );
+public:
+  bool handleGDMessage( MSG * message, long * result );
 
 private slots:
   /// Return true while scanning GoldenDict window
diff -Nru goldendict-1.5.0~git20131003/mainwindow.ui goldendict-1.5.0~git20150923/mainwindow.ui
--- goldendict-1.5.0~git20131003/mainwindow.ui	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/mainwindow.ui	2015-09-23 08:26:24.000000000 +0000
@@ -46,7 +46,16 @@
         <string>Welcome!</string>
        </attribute>
        <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
        </layout>
@@ -61,7 +70,7 @@
      <x>0</x>
      <y>0</y>
      <width>653</width>
-     <height>21</height>
+     <height>18</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -92,6 +101,8 @@
     <property name="title">
      <string>&amp;Help</string>
     </property>
+    <addaction name="showReference"/>
+    <addaction name="separator"/>
     <addaction name="visitHomepage"/>
     <addaction name="visitForum"/>
     <addaction name="separator"/>
@@ -120,9 +131,17 @@
     <addaction name="separator"/>
     <addaction name="clearHistory"/>
    </widget>
+   <widget class="QMenu" name="menuSearch">
+    <property name="title">
+     <string>Search</string>
+    </property>
+    <addaction name="searchInPageAction"/>
+    <addaction name="fullTextSearchAction"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
    <addaction name="menu_Edit"/>
+   <addaction name="menuSearch"/>
    <addaction name="menuHistory"/>
    <addaction name="menu_Help"/>
   </widget>
@@ -355,9 +374,6 @@
    <property name="toolTip">
     <string>About GoldenDict</string>
    </property>
-   <property name="shortcut">
-    <string>F1</string>
-   </property>
    <property name="menuRole">
     <enum>QAction::AboutRole</enum>
    </property>
@@ -545,6 +561,39 @@
     <string>Menu Button</string>
    </property>
   </action>
+  <action name="searchInPageAction">
+   <property name="text">
+    <string>Search in page</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::TextHeuristicRole</enum>
+   </property>
+  </action>
+  <action name="fullTextSearchAction">
+   <property name="text">
+    <string>Full-text search</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+F</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::TextHeuristicRole</enum>
+   </property>
+  </action>
+  <action name="showReference">
+   <property name="text">
+    <string>GoldenDict reference</string>
+   </property>
+   <property name="shortcut">
+    <string>F1</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff -Nru goldendict-1.5.0~git20131003/mdx.cc goldendict-1.5.0~git20150923/mdx.cc
--- goldendict-1.5.0~git20131003/mdx.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/mdx.cc	2015-09-23 08:26:24.000000000 +0000
@@ -9,13 +9,15 @@
 #include "wstring.hh"
 #include "wstring_qt.hh"
 #include "chunkedstorage.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "langcoder.hh"
 #include "fsencoding.hh"
 #include "audiolink.hh"
 #include "ex.hh"
 #include "mdictparser.hh"
 #include "filetype.hh"
+#include "ftshelpers.hh"
+#include "htmlescape.hh"
 
 #include <algorithm>
 #include <map>
@@ -102,6 +104,7 @@
 class IndexedMdd: public BtreeIndexing::BtreeIndex
 {
   Mutex & idxMutex;
+  Mutex fileMutex;
   ChunkedStorage::Reader & chunks;
   QFile mddFile;
   bool isFileOpen;
@@ -241,6 +244,23 @@
   virtual sptr< Dictionary::DataRequest > getResource( string const & name ) throw( std::exception );
   virtual QString const & getDescription();
 
+  virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                            int searchMode, bool matchCase,
+                                                            int distanceBetweenWords,
+                                                            int maxResults );
+  virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+  virtual void setFTSParameters( Config::FullTextSearch const & fts )
+  {
+    if( ensureInitDone().size() )
+      return;
+
+    can_FTS = fts.enabled
+              && !fts.disabledTypes.contains( "MDICT", Qt::CaseInsensitive )
+              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
 protected:
 
   virtual void loadIcon() throw();
@@ -251,7 +271,7 @@
   void doDeferredInit();
 
   /// Loads an article with the given offset, filling the given strings.
-  void loadArticle( uint32_t offset, string & articleText );
+  void loadArticle( uint32_t offset, string & articleText, bool noFilter = false );
 
   /// Process resource links (images, audios, etc)
   QString & filterResource( QString const & articleId, QString & article );
@@ -285,6 +305,16 @@
 
   dictFile.setFileName( QString::fromUtf8( dictionaryFiles[ 0 ].c_str() ) );
   dictFile.open( QIODevice::ReadOnly );
+
+  // Full-text search parameters
+
+  can_FTS = true;
+
+  ftsIdxName = indexFile + "_FTS";
+
+  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+    FTS_index_completed.ref();
 }
 
 MdxDictionary::~MdxDictionary()
@@ -428,6 +458,60 @@
   }
 }
 
+void MdxDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "MDict: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "MDict: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void MdxDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    headword.clear();
+    string articleText;
+
+    loadArticle( articleAddress, articleText, true );
+    text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "MDict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+sptr< Dictionary::DataRequest > MdxDictionary::getSearchResults( QString const & searchString,
+                                                                 int searchMode, bool matchCase,
+                                                                 int distanceBetweenWords,
+                                                                 int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 /// MdxDictionary::getArticle
 
 class MdxArticleRequest;
@@ -791,6 +875,7 @@
   }
   else
   {
+    Mutex::Lock _( idxMutex );
     vector< char > chunk;
     char * dictDescription = chunks.getBlock( idxHeader.descriptionAddress, chunk );
     string str( dictDescription );
@@ -820,7 +905,7 @@
   dictionaryIconLoaded = true;
 }
 
-void MdxDictionary::loadArticle( uint32_t offset, string & articleText )
+void MdxDictionary::loadArticle( uint32_t offset, string & articleText, bool noFilter )
 {
   vector< char > chunk;
   Mutex::Lock _( idxMutex );
@@ -848,7 +933,8 @@
                                           recordInfo.recordSize );
 
   article = MdictParser::substituteStylesheet( article, styleSheets );
-  article = filterResource( articleId, article );
+  if( !noFilter )
+    article = filterResource( articleId, article );
   articleText = string( article.toUtf8().constData() );
 }
 
@@ -879,6 +965,13 @@
          .replace( QRegExp( "(<\\s*link\\s+[^>]*\\bhref\\b\\s*=\\s*)(?!['\"]+)(?!bres:|data:)(?:file://)?([^\\s>]+)",
                             Qt::CaseInsensitive, QRegExp::RegExp2 ),
                    "\\1\"bres://" + id + "/\\\"" )
+         // javascripts
+         .replace( QRegExp( "(<\\s*script\\s+[^>]*\\bsrc\\b\\s*=\\s*[\"']+)(?:file://)?[\\x00-\\x30\\x7f]*([^\"']*)",
+                            Qt::CaseInsensitive, QRegExp::RegExp2 ),
+                   "\\1bres://" + id + "/\\2" )
+         .replace( QRegExp( "(<\\s*script\\s+[^>]*\\bsrc\\b\\s*=\\s*)(?!['\"]+)(?!bres:|data:)(?:file://)?([^\\s>]+)",
+                            Qt::CaseInsensitive, QRegExp::RegExp2 ),
+                   "\\1\"bres://" + id + "/\\\"" )
          // images
          .replace( QRegExp( "(<\\s*img\\s+[^>]*\\bsrc\\b\\s*=\\s*[\"']+)(?:file://)?[\\x00-\\x1f\\x7f]*([^\"']*)",
                             Qt::CaseInsensitive, QRegExp::RegExp2 ),
@@ -1010,7 +1103,7 @@
     {
       // Building the index
 
-      qDebug( "MDict: Building the index for dictionary: %s\n", i->c_str() );
+      gdDebug( "MDict: Building the index for dictionary: %s\n", i->c_str() );
 
       MdictParser parser;
       list< sptr< MdictParser > > mddParsers;
@@ -1029,7 +1122,7 @@
           sptr< MdictParser > mddParser = new MdictParser();
           if ( !mddParser->open( mddIter->c_str() ) )
           {
-            qWarning( "Warning: Broken mdd (resource) file: %s\n", mddIter->c_str() );
+            gdWarning( "Warning: Broken mdd (resource) file: %s\n", mddIter->c_str() );
             continue;
           }
           mddParsers.push_back( mddParser );
@@ -1105,7 +1198,7 @@
       // Finish with the chunks
       idxHeader.chunksOffset = chunks.finish();
 
-      DPRINTF( "Writing index...\n" );
+      GD_DPRINTF( "Writing index...\n" );
 
       // Good. Now build the index
       IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
diff -Nru goldendict-1.5.0~git20131003/mediawiki.cc goldendict-1.5.0~git20150923/mediawiki.cc
--- goldendict-1.5.0~git20131003/mediawiki.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/mediawiki.cc	2015-09-23 08:26:24.000000000 +0000
@@ -8,7 +8,7 @@
 #include <QUrl>
 #include <QtXml>
 #include <list>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "audiolink.hh"
 #include "langcoder.hh"
 
@@ -121,7 +121,7 @@
                                                         QNetworkAccessManager & mgr ):
   livedLongEnough( false ), isCancelling( false )
 {
-  DPRINTF( "request begin\n" );
+  GD_DPRINTF( "request begin\n" );
   QUrl reqUrl( url + "/api.php?action=query&list=allpages&aplimit=40&format=xml" );
 
   reqUrl.addQueryItem( "apfrom", gd::toQString( str ) );
@@ -131,6 +131,13 @@
   connect( netReply.get(), SIGNAL( finished() ),
            this, SLOT( downloadFinished() ) );
 
+#ifndef QT_NO_OPENSSL
+
+  connect( netReply.get(), SIGNAL( sslErrors( QList< QSslError > ) ),
+           netReply.get(), SLOT( ignoreSslErrors() ) );
+
+#endif
+
   // We start a timer to postpone early destruction, so a rapid type won't make
   // unnecessary network load
   startTimer( 200 );
@@ -147,7 +154,7 @@
 
 MediaWikiWordSearchRequest::~MediaWikiWordSearchRequest()
 {
-  DPRINTF( "request end\n" );
+  GD_DPRINTF( "request end\n" );
 }
 
 void MediaWikiWordSearchRequest::cancel()
@@ -164,7 +171,7 @@
   }
   else
   {
-    DPRINTF("not long enough\n" );
+    GD_DPRINTF("not long enough\n" );
   }
 }
 
@@ -199,7 +206,7 @@
           matches.push_back( gd::toWString( nl.item( x ).toElement().attribute( "title" ) ) );
       }
     }
-    DPRINTF( "done.\n" );
+    GD_DPRINTF( "done.\n" );
   }
   else
     setErrorString( netReply->errorString() );
@@ -254,7 +261,7 @@
 void MediaWikiArticleRequest::addQuery( QNetworkAccessManager & mgr,
                                         wstring const & str )
 {
-  qDebug() << "MediaWiki: requesting article" << gd::toQString( str );
+  gdDebug( "MediaWiki: requesting article %s\n", gd::toQString( str ).toUtf8().data() );
 
   QUrl reqUrl( url + "/api.php?action=parse&prop=text|revid&format=xml&redirects" );
 
@@ -262,12 +269,19 @@
 
   sptr< QNetworkReply > netReply = mgr.get( QNetworkRequest( reqUrl ) );
   
+#ifndef QT_NO_OPENSSL
+
+  connect( netReply.get(), SIGNAL( sslErrors( QList< QSslError > ) ),
+           netReply.get(), SLOT( ignoreSslErrors() ) );
+
+#endif
+
   netReplies.push_back( std::make_pair( netReply, false ) );
 }
 
 void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
 {
-  DPRINTF( "Finished.\n" );
+  GD_DPRINTF( "Finished.\n" );
 
   if ( isFinished() ) // Was cancelled
     return;
@@ -321,7 +335,36 @@
           if ( !textNode.isNull() )
           {
             QString articleString = textNode.toElement().text();
-  
+
+            // Replace all ":" in links, remove '#' part in links to other articles
+            int pos = 0;
+            QRegExp regLinks( "<a\\s+href=\"/([^\"]+)\"" );
+            for( ; ; )
+            {
+              pos = regLinks.indexIn( articleString, pos );
+              if( pos < 0 )
+                break;
+              QString link = regLinks.cap( 1 );
+
+              if( link.indexOf( "://" ) >= 0 )
+              {
+                // External link
+                pos += regLinks.cap().size();
+                continue;
+              }
+
+              if( link.indexOf( ':' ) >= 0 )
+                link.replace( ':', "%3A" );
+
+              int n = link.indexOf( '#', 1 );
+              if( n > 0 )
+                link.truncate( n );
+
+              QString newLink = QString( "<a href=\"/%1\"" ).arg( link );
+              articleString.replace( pos, regLinks.cap().size(), newLink );
+              pos += newLink.size();
+            }
+
             QUrl wikiUrl( url );
             wikiUrl.setPath( "" );
   
@@ -329,22 +372,47 @@
             articleString.replace( QRegExp( "<a\\shref=\"(/(\\w*/)*index.php\\?)" ),
                                    QString( "<a href=\"%1\\1" ).arg( wikiUrl.toString() ) );
 
+            // audio tag
+            QRegExp reg1( "<audio\\s.+</audio>", Qt::CaseInsensitive, QRegExp::RegExp2 );
+            reg1.setMinimal( true );
+            QRegExp reg2( "<source\\s+src=\"([^\"]+)", Qt::CaseInsensitive );
+            pos = 0;
+            for( ; ; )
+            {
+              pos = reg1.indexIn( articleString, pos );
+              if( pos >= 0 )
+              {
+                QString tag = reg1.cap();
+                if( reg2.indexIn( tag ) >= 0 )
+                {
+                  QString ref = reg2.cap( 1 );
+                  QString audio_url = "<a href=\"" + ref
+                                      + "\"><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" align=\"absmiddle\" alt=\"Play\"/></a>";
+                  articleString.replace( pos, tag.length(), audio_url );
+                }
+                pos += 1;
+              }
+              else
+                break;
+            }
+
             // audio url
             articleString.replace( QRegExp( "<a\\s+href=\"(//upload\\.wikimedia\\.org/wikipedia/commons/[^\"'&]*\\.ogg)" ),
-                                   QString::fromStdString( addAudioLink( "\"http:\\1\"",this->dictPtr->getId() )+ "<a href=\"http:\\1" ) );
+                                   QString::fromStdString( addAudioLink( string( "\"" ) + wikiUrl.scheme().toStdString() + ":\\1\"",
+                                                                         this->dictPtr->getId() ) + "<a href=\"" + wikiUrl.scheme().toStdString() + ":\\1" ) );
 
-            // Add "http:" to image source urls
-            articleString.replace( " src=\"//", " src=\"http://" );
+            // Add url scheme to image source urls
+            articleString.replace( " src=\"//", " src=\"" + wikiUrl.scheme() + "://" );
             //fix src="/foo/bar/Baz.png"
-            articleString.replace( "src=\"/", "src=\"" + url +"/" );
+            articleString.replace( "src=\"/", "src=\"" + wikiUrl.toString() +"/" );
 
             // Replace the href="/foo/bar/Baz" to just href="Baz".
             articleString.replace( QRegExp( "<a\\shref=\"/([\\w\\.]*/)*" ), "<a href=\"" );
 
             //fix audio
-            articleString.replace( QRegExp("<button\\s+[^>]*(upload\\.wikimedia\\.org/wikipedia/commons/[^\"'&]*\\.ogg)[^>]*>\\s*<[^<]*</button>"),
-                                            QString::fromStdString(addAudioLink("\"http://\\1\"",this->dictPtr->getId())+
-                                           "<a href=\"http://\\1\"><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" alt=\"Play\"></a>"));
+            articleString.replace( QRegExp( "<button\\s+[^>]*(upload\\.wikimedia\\.org/wikipedia/commons/[^\"'&]*\\.ogg)[^>]*>\\s*<[^<]*</button>"),
+                                            QString::fromStdString(addAudioLink( string( "\"" ) + wikiUrl.scheme().toStdString() + "://\\1\"", this->dictPtr->getId() ) +
+                                            "<a href=\"" + wikiUrl.scheme().toStdString() + "://\\1\"><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" alt=\"Play\"></a>" ) );
             // In those strings, change any underscores to spaces
             for( ; ; )
             {
@@ -356,7 +424,7 @@
             }
 
             //fix file: url
-            articleString.replace( QRegExp("<a\\s+href=\"([^:/\"]+:[^/\"]+\")" ),
+            articleString.replace( QRegExp("<a\\s+href=\"([^:/\"]*file%3A[^/\"]+\")", Qt::CaseInsensitive ),
                                    QString( "<a href=\"%1/index.php?title=\\1" ).arg( url ));
 
             QByteArray articleBody = articleString.toUtf8();
@@ -379,7 +447,7 @@
           }
         }
       }
-      DPRINTF( "done.\n" );
+      GD_DPRINTF( "done.\n" );
     }
     else
       setErrorString( netReply->errorString() );
diff -Nru goldendict-1.5.0~git20131003/mouseover.cc goldendict-1.5.0~git20150923/mouseover.cc
--- goldendict-1.5.0~git20131003/mouseover.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/mouseover.cc	2015-09-23 08:26:24.000000000 +0000
@@ -242,7 +242,7 @@
     {
         if( ( res & GD_FLAG_METHOD_UI_AUTOMATION ) == 0 )
             return 0;
-        POINT pt = Global_Data->CurMod.Pt;
+        POINT pt = Global_Data->LastPt;
         WCHAR *pwstr = gdGetWordAtPointByAutomation( pt );
         if( pwstr == NULL ) return 0;
         wordSeq = QString::fromWCharArray( pwstr );
@@ -342,15 +342,18 @@
 
     // See if we have an RTL char. Reverse the whole string if we do.
 
-    for( int x = 0; x < word.size(); ++x )
+    if( lparam == 0 )
     {
-      QChar::Direction d = word[ x ].direction();
-
-      if ( d == QChar::DirR || d == QChar::DirAL ||
-           d == QChar::DirRLE || d == QChar::DirRLO )
+      for( int x = 0; x < word.size(); ++x )
       {
-        std::reverse( word.begin(), word.end() );
-        break;
+        QChar::Direction d = word[ x ].direction();
+
+        if ( d == QChar::DirR || d == QChar::DirAL ||
+             d == QChar::DirRLE || d == QChar::DirRLO )
+        {
+          std::reverse( word.begin(), word.end() );
+          break;
+        }
       }
     }
 
diff -Nru goldendict-1.5.0~git20131003/mouseover_win32/GetWord.c goldendict-1.5.0~git20150923/mouseover_win32/GetWord.c
--- goldendict-1.5.0~git20131003/mouseover_win32/GetWord.c	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/mouseover_win32/GetWord.c	2015-09-23 08:26:24.000000000 +0000
@@ -80,14 +80,19 @@
 	int BeginPos;
 } TConsoleParams;
 
-static int GetWordFromConsolePack(TConsoleParams *params)
+static int GetWordFromConsolePack(TConsoleParams *params, BOOL *pInvalidConsole)
 {
 	int WordLen=0;
 
+	*pInvalidConsole = TRUE;
+
 	HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	if (hStdOut != INVALID_HANDLE_VALUE) {
+	if (hStdOut != INVALID_HANDLE_VALUE && hStdOut != 0) {
 		CONSOLE_SCREEN_BUFFER_INFO csbi;
 		if (GetConsoleScreenBufferInfo(hStdOut, &csbi)) {
+
+			*pInvalidConsole = FALSE;
+
 			COORD CurPos;
 			CurPos.X = csbi.srWindow.Left + (SHORT)(params->Pt.x * (csbi.srWindow.Right - csbi.srWindow.Left + 1) / params->ClientRect.right);
 			CurPos.Y = csbi.srWindow.Top + (SHORT)(params->Pt.y * (csbi.srWindow.Bottom - csbi.srWindow.Top + 1) / params->ClientRect.bottom);
@@ -129,6 +134,7 @@
 	DWORD pid;
 	DWORD WordSize;
 	char *Result;
+	BOOL invalidConsole;
 
 	*BeginPos=0;
 	if((TP = malloc(sizeof(TConsoleParams))) == NULL)
@@ -145,7 +151,7 @@
 	if (pid != GetCurrentProcessId()) {
 	        if(Is_XP_And_Later()) {
 			if(AttachConsole(pid)) {
-				WordSize = GetWordFromConsolePack(TP);
+				WordSize = GetWordFromConsolePack(TP, &invalidConsole);
 				FreeConsole();
 			} else {
 				WordSize = 0;
@@ -154,7 +160,25 @@
 			WordSize = 0;
 		}
 	} else {
-		WordSize = GetWordFromConsolePack(TP);
+		WordSize = GetWordFromConsolePack(TP, &invalidConsole);
+		if( invalidConsole ) {
+			/*
+			 Under Win 8.1 GetWindowThreadProcessId return current "conhost" process ID
+			 instead of target window process ID.
+			 We try to attach console to parent process.
+			*/
+			
+		        if(Is_XP_And_Later()) {
+				if(AttachConsole( (DWORD)-1 )) {
+					WordSize = GetWordFromConsolePack(TP, &invalidConsole);
+					FreeConsole();
+				} else {
+					WordSize = 0;
+				}
+			} else {
+				WordSize = 0;
+			}
+		}	
 	}
 
 	if (WordSize > 0 && WordSize <= 255) {
diff -Nru goldendict-1.5.0~git20131003/mouseover_win32/TextOutHook.c goldendict-1.5.0~git20150923/mouseover_win32/TextOutHook.c
--- goldendict-1.5.0~git20131003/mouseover_win32/TextOutHook.c	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/mouseover_win32/TextOutHook.c	2015-09-23 08:26:24.000000000 +0000
@@ -571,7 +571,7 @@
 	}
 }
 
-DLLIMPORT void __gdGetWord (TCurrentMode *P)
+DLLIMPORT DWORD __gdGetWord (TCurrentMode *P)
 {
 	TCHAR wClassName[64];
 	TKnownWndClass WndClass;
@@ -588,6 +588,10 @@
 	} else {
 		P->WordLen = 0;
 	}
+	if(WndClass == kwcConsole || WndClass == kwcConEmu)
+		return 1;
+
+	return 0;
 }
 
 
diff -Nru goldendict-1.5.0~git20131003/mouseover_win32/TextOutSpy.c goldendict-1.5.0~git20150923/mouseover_win32/TextOutSpy.c
--- goldendict-1.5.0~git20131003/mouseover_win32/TextOutSpy.c	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/mouseover_win32/TextOutSpy.c	2015-09-23 08:26:24.000000000 +0000
@@ -13,12 +13,12 @@
 HANDLE hSynhroMutex = 0;
 HINSTANCE hGetWordLib = 0;
 UINT_PTR TimerID = 0;
-typedef void (*GetWordProc_t)(TCurrentMode *);
+typedef DWORD (*GetWordProc_t)(TCurrentMode *);
 GetWordProc_t GetWordProc = NULL;
 GDDataStruct gds;
 UINT uGdAskMessage;
 WCHAR Buffer[256];
-DWORD ourProcessID;
+DWORD ourProcessID, gdProcessID, winProcessID;
 
 static HWND GetWindowFromPoint(POINT pt)
 {
@@ -83,18 +83,23 @@
 					GlobalData32->CurMod.BeginPos = 0;
 					lstrcpyn( GlobalData32->CurMod.MatchedWord, GlobalData->CurMod.MatchedWord, sizeof( GlobalData32->CurMod.MatchedWord ) );
 #endif
-					SendMessageTimeout(GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 0, SMTO_ABORTIFHUNG, MOUSEOVER_INTERVAL, &SendMsgAnswer);
+					SendMessageTimeout(GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 1, SMTO_ABORTIFHUNG, MOUSEOVER_INTERVAL, &SendMsgAnswer);
 				}
 			}
 			return;
 		}
 	}
 
+	// Don't use other methods for GD own windows
+	if( winProcessID == gdProcessID ) 
+		return;
+
 	if( ( flags & GD_FLAG_METHOD_STANDARD ) != 0 && GetWordProc != 0 ) {
 		GlobalData->CurMod.WND = GlobalData->LastWND;
 		GlobalData->CurMod.Pt = GlobalData->LastPt;
 
-		GetWordProc(&(GlobalData->CurMod));
+		LPARAM lparam = GetWordProc(&(GlobalData->CurMod));
+		// lparam == 0 - need to reverse RTL text, else don't reverse
 
 		if (GlobalData->CurMod.WordLen > 0) {
 			if( IsWindow( GlobalData->ServerWND ) ) {
@@ -104,7 +109,7 @@
 				GlobalData32->CurMod.BeginPos = GlobalData->CurMod.BeginPos;
 				lstrcpyn( GlobalData32->CurMod.MatchedWord, GlobalData->CurMod.MatchedWord, sizeof( GlobalData32->CurMod.MatchedWord ) );
 #endif
-				SendMessageTimeout(GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 0, SMTO_ABORTIFHUNG, MOUSEOVER_INTERVAL, &SendMsgAnswer);
+				SendMessageTimeout(GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, lparam, SMTO_ABORTIFHUNG, MOUSEOVER_INTERVAL, &SendMsgAnswer);
 			}
 			return;
 		}
@@ -120,14 +125,20 @@
 				GlobalData32->CurMod.BeginPos = GlobalData->CurMod.BeginPos;
 				lstrcpyn( GlobalData32->CurMod.MatchedWord, GlobalData->CurMod.MatchedWord, sizeof( GlobalData32->CurMod.MatchedWord ) );
 #endif
-				SendMessageTimeout(GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 0, SMTO_ABORTIFHUNG, MOUSEOVER_INTERVAL, &SendMsgAnswer);
+				SendMessageTimeout(GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 1, SMTO_ABORTIFHUNG, MOUSEOVER_INTERVAL, &SendMsgAnswer);
 			}
 			return;
 		}
 	}
 
 	if( ( flags & GD_FLAG_METHOD_UI_AUTOMATION ) != 0 && IsWindow( GlobalData->ServerWND ) ) {
-		PostMessage( GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 0 );
+#ifdef __WIN64
+		GlobalData32->CurMod.MatchedWord[0] = 0;
+		GlobalData32->CurMod.WordLen = 0;
+		GlobalData32->CurMod.BeginPos = 0;
+		GlobalData32->LastPt = GlobalData->LastPt;
+#endif
+		PostMessage( GlobalData->ServerWND, WM_MY_SHOW_TRANSLATION, 0, 1 );
 	}		
 }
 
@@ -144,7 +155,7 @@
 		while( 1 ) {
 			POINT curPt;
 			HWND targetWnd;
-			DWORD winProcessID = 0;
+			winProcessID = 0;
 
 			if( !GetCursorPos( &curPt ) ) 
 				break;
@@ -309,6 +320,7 @@
 				return FALSE;
 			}
 			ourProcessID = GetCurrentProcessId();
+			GetWindowThreadProcessId( GlobalData->ServerWND, &gdProcessID );
 			if(hSynhroMutex==0) {
 				hSynhroMutex = CreateMutex(NULL, FALSE, "GoldenDictTextOutSpyMutex");
 				if(hSynhroMutex==0) {
diff -Nru goldendict-1.5.0~git20131003/nsis/GoldenDict.nsi goldendict-1.5.0~git20150923/nsis/GoldenDict.nsi
--- goldendict-1.5.0~git20131003/nsis/GoldenDict.nsi	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/nsis/GoldenDict.nsi	2015-09-23 08:26:24.000000000 +0000
@@ -1,7 +1,7 @@
 !include "MUI2.nsh"
 
   Name "GoldenDict"
-  OutFile "GoldenDict-1.0.5-Install.exe"
+  OutFile "GoldenDict-1.5.0-Install.exe"
 
   InstallDir "$PROGRAMFILES\GoldenDict"
 
diff -Nru goldendict-1.5.0~git20131003/orderandprops.cc goldendict-1.5.0~git20150923/orderandprops.cc
--- goldendict-1.5.0~git20131003/orderandprops.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/orderandprops.cc	2015-09-23 08:26:24.000000000 +0000
@@ -89,13 +89,6 @@
 {
   ui.setupUi( this );
 
-  // For now we don't support arrows, so remove them until we get to that
-  delete ui.moveActiveUp;
-  delete ui.moveActiveDown;
-
-  delete ui.moveToActive;
-  delete ui.moveToInactive;
-
   Instances::Group order( dictionaryOrder, allDictionaries );
   Instances::Group inactive( inactiveDictionaries, allDictionaries );
 
@@ -125,6 +118,13 @@
 
   connect (ui.searchLine, SIGNAL( filterChanged( QString const & ) ),
       this, SLOT( filterChanged( QString const &) ) );
+
+  connect( ui.dictionaryOrder->getModel(), SIGNAL( contentChanged() ),
+           this, SLOT( showDictNumbers() ) );
+  connect( ui.inactiveDictionaries->getModel(), SIGNAL( contentChanged() ),
+           this, SLOT( showDictNumbers() ) );
+
+  showDictNumbers();
 }
 
 Config::Group OrderAndProps::getCurrentDictionaryOrder() const
@@ -191,6 +191,8 @@
   ui.dictionaryDescription->clear();
   ui.dictionaryDescription->setVisible( false );
   ui.dictionaryDescriptionLabel->setVisible( false );
+  ui.infoVerticalSpacer->changeSize( 20, 5, QSizePolicy::Minimum, QSizePolicy::Expanding );
+  ui.infoVerticalLayout->invalidate();
 }
 
 void OrderAndProps::describeDictionary( DictListWidget * lst, QModelIndex const & idx )
@@ -233,12 +235,15 @@
       ui.dictionaryDescription->setPlainText( descText );
       ui.dictionaryDescription->setVisible( true );
       ui.dictionaryDescriptionLabel->setVisible( true );
+      ui.infoVerticalSpacer->changeSize( 0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum );
     }
     else
     {
       ui.dictionaryDescription->setVisible( false );
       ui.dictionaryDescriptionLabel->setVisible( false );
+      ui.infoVerticalSpacer->changeSize( 20, 5, QSizePolicy::Minimum, QSizePolicy::Expanding );
     }
+    ui.infoVerticalLayout->invalidate();
   }
 }
 
@@ -250,6 +255,18 @@
   QAction * sortLangAction = new QAction( tr( "Sort by languages" ), &menu );
   menu.addAction( sortLangAction );
 
+  QAction * showHeadwordsAction = NULL;
+
+  QModelIndex idx = ui.searchLine->mapToSource( ui.dictionaryOrder->indexAt( pos ) );
+  sptr< Dictionary::Class > dict;
+  if( idx.isValid() && (unsigned)idx.row() < ui.dictionaryOrder->getCurrentDictionaries().size() )
+    dict = ui.dictionaryOrder->getCurrentDictionaries()[ idx.row() ];
+  if ( dict && dict->getWordCount() > 0 )
+  {
+    showHeadwordsAction = new QAction( tr( "Dictionary headwords" ), &menu );
+    menu.addAction( showHeadwordsAction );
+  }
+
   QAction * result = menu.exec( ui.dictionaryOrder->mapToGlobal( pos ) );
 
   if( result == sortNameAction || result == sortLangAction )
@@ -261,4 +278,16 @@
       sort( sortedDicts.begin(), sortedDicts.end(), dictLessThan );
     ui.dictionaryOrder->populate( sortedDicts );
   }
+
+  if( result && result == showHeadwordsAction )
+  {
+    emit showDictionaryHeadwords( QString::fromUtf8( dict->getId().c_str() ) );
+  }
+}
+
+void OrderAndProps::showDictNumbers()
+{
+  ui.dictionariesNumber->setText( tr( "Dictionaries active: %1, inactive: %2" )
+                                  .arg( QString::number( ui.dictionaryOrder->getModel()->rowCount( QModelIndex() ) ) )
+                                  .arg( QString::number( ui.inactiveDictionaries->getModel()->rowCount( QModelIndex() ) ) ) );
 }
diff -Nru goldendict-1.5.0~git20131003/orderandprops.hh goldendict-1.5.0~git20150923/orderandprops.hh
--- goldendict-1.5.0~git20131003/orderandprops.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/orderandprops.hh	2015-09-23 08:26:24.000000000 +0000
@@ -29,6 +29,7 @@
   void filterChanged( QString const & filterText );
   void dictListFocused();
   void inactiveDictListFocused();
+  void showDictNumbers();
 
 private:
 
@@ -36,6 +37,9 @@
 
   void disableDictionaryDescription();
   void describeDictionary( DictListWidget *, QModelIndex const & );
+
+signals:
+  void showDictionaryHeadwords( QString const & dictId );
 };
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/orderandprops.ui goldendict-1.5.0~git20150923/orderandprops.ui
--- goldendict-1.5.0~git20131003/orderandprops.ui	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/orderandprops.ui	2015-09-23 08:26:24.000000000 +0000
@@ -23,51 +23,12 @@
          <item row="3" column="0">
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QToolButton" name="moveToActive">
+            <widget class="QLabel" name="dictionariesNumber">
              <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::UpArrow</enum>
+              <string notr="true"/>
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QToolButton" name="moveToInactive">
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::DownArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
           </layout>
          </item>
          <item row="0" column="0">
@@ -81,54 +42,7 @@
           <widget class="DictListWidget" name="dictionaryOrder"/>
          </item>
          <item row="2" column="1">
-          <layout class="QVBoxLayout" name="verticalLayout_2">
-           <item>
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QToolButton" name="moveActiveUp">
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::UpArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="moveActiveDown">
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="arrowType">
-              <enum>Qt::DownArrow</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
+          <layout class="QVBoxLayout" name="verticalLayout_2"/>
          </item>
          <item row="5" column="0">
           <widget class="DictListWidget" name="inactiveDictionaries"/>
@@ -152,7 +66,7 @@
        <property name="title">
         <string>Dictionary information</string>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_5">
+       <layout class="QVBoxLayout" name="infoVerticalLayout">
         <item>
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
@@ -170,6 +84,9 @@
             <property name="textFormat">
              <enum>Qt::PlainText</enum>
             </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+            </property>
            </widget>
           </item>
           <item row="1" column="1">
@@ -297,7 +214,7 @@
          </widget>
         </item>
         <item>
-         <spacer name="verticalSpacer_4">
+         <spacer name="infoVerticalSpacer">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -428,10 +345,6 @@
  </customwidgets>
  <tabstops>
   <tabstop>dictionaryOrder</tabstop>
-  <tabstop>moveActiveUp</tabstop>
-  <tabstop>moveActiveDown</tabstop>
-  <tabstop>moveToActive</tabstop>
-  <tabstop>moveToInactive</tabstop>
   <tabstop>inactiveDictionaries</tabstop>
   <tabstop>dictionaryDescription</tabstop>
   <tabstop>dictionaryFileList</tabstop>
diff -Nru goldendict-1.5.0~git20131003/preferences.cc goldendict-1.5.0~git20150923/preferences.cc
--- goldendict-1.5.0~git20131003/preferences.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/preferences.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,11 +4,16 @@
 #include "langcoder.hh"
 #include <QMessageBox>
 #include "broken_xrecord.hh"
+#include "mainwindow.hh"
 
 
-Preferences::Preferences( QWidget * parent, Config::Preferences const & p ):
+Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   QDialog( parent ), prevInterfaceLanguage( 0 )
+, helpWindow( 0 )
+, cfg( cfg_ )
+, helpAction( this )
 {
+  Config::Preferences const & p = cfg_.preferences;
   ui.setupUi( this );
 
   connect( ui.enableScanPopup, SIGNAL( toggled( bool ) ),
@@ -37,6 +42,17 @@
   connect( ui.rightShift, SIGNAL( clicked( bool ) ),
            this, SLOT( sideShiftClicked( bool ) ) );
 
+  connect( ui.buttonBox, SIGNAL( helpRequested() ),
+           this, SLOT( helpRequested() ) );
+
+  helpAction.setShortcut( QKeySequence( "F1" ) );
+  helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
+
+  connect( &helpAction, SIGNAL( triggered() ),
+           this, SLOT( helpRequested() ) );
+
+  addAction( &helpAction );
+
   // Load values into form
 
   ui.interfaceLanguage->addItem( tr( "System default" ), QString() );
@@ -77,6 +93,49 @@
       break;
     }
 
+  // Fill help languages combobox
+
+  ui.helpLanguage->addItem( tr( "Default" ), QString() );
+
+  // See which helps do we have
+
+  QStringList availHelps = QDir( Config::getHelpDir() ).entryList( QStringList( "*.qch" ),
+                                                                 QDir::Files );
+
+  QMap< QString, QPair< QIcon, QString > > sortedHelps;
+
+  for( QStringList::iterator i = availHelps.begin(); i != availHelps.end(); ++i )
+  {
+    QString loc = i->mid( 7, i->length() - 11 );
+    QString lang = loc.mid( 0, 2 );
+    QString reg;
+    if(loc.length() >= 5 )
+      reg = loc.mid( 3, 2 ).toLower();
+    else
+    {
+      if( lang.compare( "en", Qt::CaseInsensitive ) == 0 )
+        reg = "US";
+      else
+        reg = lang.toUpper();
+    }
+
+    sortedHelps.insertMulti(
+      Language::localizedNameForId( LangCoder::code2toInt( lang.toLatin1().data() ) ),
+      QPair< QIcon, QString >(
+        QIcon( QString( ":/flags/%1.png" ).arg( reg.toLower() ) ), lang + "_" + reg ) );
+  }
+
+  for( QMap< QString, QPair< QIcon, QString > >::iterator i = sortedHelps.begin();
+       i != sortedHelps.end(); ++i )
+    ui.helpLanguage->addItem( i.value().first, i.key(), i.value().second );
+
+  for( int x = 0; x < ui.helpLanguage->count(); ++x )
+    if ( ui.helpLanguage->itemData( x ).toString() == p.helpLanguage )
+    {
+      ui.helpLanguage->setCurrentIndex( x );
+      break;
+    }
+
   ui.displayStyle->addItem( QIcon( ":/icons/programicon_old.png" ), tr( "Default" ), QString() );
   ui.displayStyle->addItem( QIcon( ":/icons/programicon.png" ), tr( "Modern" ), QString( "modern" ) );
   ui.displayStyle->addItem( QIcon( ":/icons/icon32_dsl.png" ), tr( "Lingvo" ), QString( "lingvo" ) );
@@ -151,6 +210,11 @@
   ui.rightCtrl->hide();
   ui.leftShift->hide();
   ui.rightShift->hide();
+#ifdef Q_OS_MAC
+  ui.altKey->setText( "Opt" );
+  ui.winKey->setText( "Ctrl" );
+  ui.ctrlKey->setText( "Cmd" );
+#endif
 #endif
 
 //Platform-specific options
@@ -195,6 +259,23 @@
   ui.proxyUser->setText( p.proxyServer.user );
   ui.proxyPassword->setText( p.proxyServer.password );
 
+  if( p.proxyServer.useSystemProxy )
+  {
+    ui.systemProxy->setChecked( true );
+    ui.customSettingsGroup->setEnabled( false );
+  }
+  else
+  {
+    ui.customProxy->setChecked( true );
+    ui.customSettingsGroup->setEnabled( p.proxyServer.enabled );
+  }
+
+  connect( ui.customProxy, SIGNAL( toggled( bool ) ),
+           this, SLOT( customProxyToggled( bool ) ) );
+
+  connect( ui.useProxyServer, SIGNAL( toggled( bool ) ),
+           this, SLOT( customProxyToggled( bool ) ) );
+
   ui.checkForNewReleases->setChecked( p.checkForNewReleases );
   ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites );
   ui.enableWebPlugins->setChecked( p.enableWebPlugins );
@@ -203,6 +284,29 @@
   // Add-on styles
   ui.addonStylesLabel->setVisible( ui.addonStyles->count() > 1 );
   ui.addonStyles->setCurrentStyle( p.addonStyle );
+
+  // Full-text search parameters
+  ui.ftsGroupBox->setChecked( p.fts.enabled );
+
+  ui.allowAard->setChecked( !p.fts.disabledTypes.contains( "AARD", Qt::CaseInsensitive ) );
+  ui.allowBGL->setChecked( !p.fts.disabledTypes.contains( "BGL", Qt::CaseInsensitive ) );
+  ui.allowDictD->setChecked( !p.fts.disabledTypes.contains( "DICTD", Qt::CaseInsensitive ) );
+  ui.allowDSL->setChecked( !p.fts.disabledTypes.contains( "DSL", Qt::CaseInsensitive ) );
+  ui.allowMDict->setChecked( !p.fts.disabledTypes.contains( "MDICT", Qt::CaseInsensitive ) );
+  ui.allowSDict->setChecked( !p.fts.disabledTypes.contains( "SDICT", Qt::CaseInsensitive ) );
+  ui.allowSlob->setChecked( !p.fts.disabledTypes.contains( "SLOB", Qt::CaseInsensitive ) );
+  ui.allowStardict->setChecked( !p.fts.disabledTypes.contains( "STARDICT", Qt::CaseInsensitive ) );
+  ui.allowXDXF->setChecked( !p.fts.disabledTypes.contains( "XDXF", Qt::CaseInsensitive ) );
+  ui.allowZim->setChecked( !p.fts.disabledTypes.contains( "ZIM", Qt::CaseInsensitive ) );
+  ui.allowEpwing->setChecked( !p.fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive ) );
+#ifndef MAKE_ZIM_SUPPORT
+  ui.allowZim->hide();
+  ui.allowSlob->hide();
+#endif
+#ifdef NO_EPWING_SUPPORT
+  ui.allowEpwing->hide();
+#endif
+  ui.maxDictionarySize->setValue( p.fts.maxDictionarySize );
 }
 
 Config::Preferences Preferences::getPreferences()
@@ -213,6 +317,10 @@
     ui.interfaceLanguage->itemData(
       ui.interfaceLanguage->currentIndex() ).toString();
 
+  p.helpLanguage =
+    ui.helpLanguage->itemData(
+      ui.helpLanguage->currentIndex() ).toString();
+
   p.displayStyle =
     ui.displayStyle->itemData(
       ui.displayStyle->currentIndex() ).toString();
@@ -273,6 +381,7 @@
   p.audioPlaybackProgram = ui.audioPlaybackProgram->text();
 
   p.proxyServer.enabled = ui.useProxyServer->isChecked();
+  p.proxyServer.useSystemProxy = ui.systemProxy->isChecked();
 
   p.proxyServer.type = ( Config::ProxyServer::Type ) ui.proxyType->currentIndex();
 
@@ -289,6 +398,86 @@
 
   p.addonStyle = ui.addonStyles->getCurrentStyle();
 
+  p.fts.enabled = ui.ftsGroupBox->isChecked();
+  p.fts.maxDictionarySize = ui.maxDictionarySize->value();
+
+  if( !ui.allowAard->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "AARD";
+  }
+
+  if( !ui.allowBGL->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "BGL";
+  }
+
+  if( !ui.allowDictD->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "DICTD";
+  }
+
+  if( !ui.allowDSL->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "DSL";
+  }
+
+  if( !ui.allowMDict->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "MDICT";
+  }
+
+  if( !ui.allowSDict->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "SDICT";
+  }
+
+  if( !ui.allowSlob->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "SLOB";
+  }
+
+  if( !ui.allowStardict->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "STARDICT";
+  }
+
+  if( !ui.allowXDXF->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "XDXF";
+  }
+
+  if( !ui.allowZim->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "ZIM";
+  }
+
+  if( !ui.allowEpwing->isChecked() )
+  {
+    if( !p.fts.disabledTypes.isEmpty() )
+      p.fts.disabledTypes += ',';
+    p.fts.disabledTypes += "EPWING";
+  }
+
   return p;
 }
 
@@ -369,3 +558,43 @@
   ui.audioPlaybackProgram->setEnabled( enabled );
 }
 
+void Preferences::customProxyToggled( bool )
+{
+  ui.customSettingsGroup->setEnabled( ui.customProxy->isChecked()
+                                      && ui.useProxyServer->isChecked() );
+}
+
+void Preferences::helpRequested()
+{
+  if( !helpWindow )
+  {
+    MainWindow * mainWindow = qobject_cast< MainWindow * >( parentWidget() );
+    if( mainWindow )
+      mainWindow->closeGDHelp();
+
+    helpWindow = new Help::HelpWindow( this, cfg );
+
+    if( helpWindow )
+    {
+      helpWindow->setWindowFlags( Qt::Window );
+
+      connect( helpWindow, SIGNAL( needClose() ),
+               this, SLOT( closeHelp() ) );
+      helpWindow->showHelpFor( "Preferences" );
+      helpWindow->show();
+    }
+  }
+  else
+  {
+    if( !helpWindow->isVisible() )
+      helpWindow->show();
+
+    helpWindow->activateWindow();
+  }
+}
+
+void Preferences::closeHelp()
+{
+  if( helpWindow )
+    helpWindow->hide();
+}
diff -Nru goldendict-1.5.0~git20131003/preferences.hh goldendict-1.5.0~git20150923/preferences.hh
--- goldendict-1.5.0~git20131003/preferences.hh	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/preferences.hh	2015-09-23 08:26:24.000000000 +0000
@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include "config.hh"
+#include "helpwindow.hh"
 #include "ui_preferences.h"
 
 /// Preferences dialog -- allows changing various program options.
@@ -12,9 +13,15 @@
 
   int prevInterfaceLanguage;
 
+  Help::HelpWindow * helpWindow;
+  Config::Class & cfg;
+  QAction helpAction;
+
 public:
 
-  Preferences( QWidget * parent, Config::Preferences const & );
+  Preferences( QWidget * parent, Config::Class & cfg_ );
+  ~Preferences()
+  { if( helpWindow ) delete helpWindow; }
 
   Config::Preferences getPreferences();
 
@@ -41,6 +48,11 @@
   void on_buttonBox_accepted();
 
   void on_useExternalPlayer_toggled( bool enabled );
+
+  void customProxyToggled( bool );
+
+  void helpRequested();
+  void closeHelp();
 };
 
 #endif
diff -Nru goldendict-1.5.0~git20131003/preferences.ui goldendict-1.5.0~git20150923/preferences.ui
--- goldendict-1.5.0~git20131003/preferences.ui	2013-10-02 20:48:35.000000000 +0000
+++ goldendict-1.5.0~git20150923/preferences.ui	2015-09-23 09:22:38.000000000 +0000
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>572</width>
+    <width>634</width>
     <height>403</height>
    </rect>
   </property>
@@ -270,6 +270,29 @@
           <widget class="QComboBox" name="displayStyle"/>
          </item>
          <item>
+          <spacer name="horizontalSpacer_12">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_16">
+           <property name="text">
+            <string>Help language</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="helpLanguage"/>
+         </item>
+         <item>
           <spacer name="horizontalSpacer_7">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -422,7 +445,16 @@
              <number>0</number>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_5">
-             <property name="margin">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
               <number>0</number>
              </property>
              <item>
@@ -556,7 +588,16 @@
                   <number>0</number>
                  </property>
                  <layout class="QVBoxLayout" name="verticalLayout_3">
-                  <property name="margin">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
                    <number>0</number>
                   </property>
                  </layout>
@@ -940,73 +981,96 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Type:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="proxyType"/>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_3">
-              <property name="text">
-               <string>Host:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="proxyHost"/>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_2">
-              <property name="text">
-               <string>Port:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="proxyPort">
-              <property name="maximum">
-               <number>65535</number>
-              </property>
-              <property name="value">
-               <number>8080</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QRadioButton" name="systemProxy">
+            <property name="text">
+             <string>System proxy</string>
+            </property>
+           </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <item>
-             <widget class="QLabel" name="label_4">
-              <property name="text">
-               <string>User:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="proxyUser"/>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_5">
-              <property name="text">
-               <string>Password:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="proxyPassword">
-              <property name="echoMode">
-               <enum>QLineEdit::Password</enum>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QRadioButton" name="customProxy">
+            <property name="text">
+             <string>Custom proxy</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="customSettingsGroup">
+            <property name="title">
+             <string>Custom settings</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_18">
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <item>
+                <widget class="QLabel" name="label">
+                 <property name="text">
+                  <string>Type:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QComboBox" name="proxyType"/>
+               </item>
+               <item>
+                <widget class="QLabel" name="label_3">
+                 <property name="text">
+                  <string>Host:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="proxyHost"/>
+               </item>
+               <item>
+                <widget class="QLabel" name="label_2">
+                 <property name="text">
+                  <string>Port:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QSpinBox" name="proxyPort">
+                 <property name="maximum">
+                  <number>65535</number>
+                 </property>
+                 <property name="value">
+                  <number>8080</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_2">
+               <item>
+                <widget class="QLabel" name="label_4">
+                 <property name="text">
+                  <string>User:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="proxyUser"/>
+               </item>
+               <item>
+                <widget class="QLabel" name="label_5">
+                 <property name="text">
+                  <string>Password:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="proxyPassword">
+                 <property name="echoMode">
+                  <enum>QLineEdit::Password</enum>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -1107,6 +1171,176 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_FTS">
+      <attribute name="icon">
+       <iconset resource="resources.qrc">
+        <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset>
+      </attribute>
+      <attribute name="title">
+       <string>Full-text search</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_19">
+       <item>
+        <spacer name="verticalSpacer_9">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="ftsGroupBox">
+         <property name="title">
+          <string>Allow full-text search for:</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="allowAard">
+            <property name="text">
+             <string notr="true">Aard</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="allowBGL">
+            <property name="text">
+             <string notr="true">BGL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="allowDictD">
+            <property name="text">
+             <string notr="true">DictD</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="allowDSL">
+            <property name="text">
+             <string notr="true">DSL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="allowMDict">
+            <property name="text">
+             <string notr="true">MDict</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="allowSDict">
+            <property name="text">
+             <string notr="true">SDict</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="allowSlob">
+            <property name="text">
+             <string notr="true">Slob</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="allowStardict">
+            <property name="text">
+             <string notr="true">Stardict</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="allowXDXF">
+            <property name="text">
+             <string notr="true">XDXF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="allowZim">
+            <property name="text">
+             <string notr="true">Zim</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0" colspan="2">
+           <layout class="QHBoxLayout" name="horizontalLayout_14">
+            <item>
+             <widget class="QLabel" name="label_14">
+              <property name="text">
+               <string>Don't search in dictionaries containing more than</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="maxDictionarySize">
+              <property name="maximum">
+               <number>10000000</number>
+              </property>
+              <property name="singleStep">
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_15">
+              <property name="text">
+               <string>articles (0 - unlimited)</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_10">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="allowEpwing">
+            <property name="text">
+             <string notr="true">Epwing</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_7">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_Advanced">
       <attribute name="title">
        <string>Ad&amp;vanced</string>
@@ -1362,7 +1596,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
diff -Nru goldendict-1.5.0~git20131003/README.md goldendict-1.5.0~git20150923/README.md
--- goldendict-1.5.0~git20131003/README.md	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/README.md	2015-09-23 08:26:24.000000000 +0000
@@ -9,7 +9,8 @@
 ### External Deps
 
 * Make, GCC, Git
-* Qt framework. Minumal required version is 4.5. But Qt 4.7 or 4.8 is recommended.
+* Qt framework. Minimum required version is 4.6 for Windows, 4.5 for all other platforms. But Qt 4.7 or 4.8 is recommended.
+* If you want to use Qt 5.x then use branch qt4x5
 * Qt Creator IDE is recommended for development
 * Various libraries on Linux (png, zlib, etc)
 * On Mac and Windows all the libraries are already included in the repository
@@ -19,7 +20,7 @@
     sudo apt-get install git pkg-config build-essential qt4-qmake \
          libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \
          libqt4-dev libqtwebkit-dev libxtst-dev liblzo2-dev libbz2-dev \
-         libao-dev libavutil-dev libavformat-dev
+         libao-dev libavutil-dev libavformat-dev libtiff5-dev libeb16-dev
 
 ## How to build
 
@@ -34,6 +35,31 @@
 In case when qmake-qt4 does not exist, try using `qmake` but make sure it is indeed from the Qt 4 installation.
 Alternatively, you might want to load `goldendict.pro` file from within Qt Creator, especially on Windows.
 
+### Building with Zim dictionaries support
+
+To add Zim and Slob formats support you need at first install lzma-dev package:
+
+    sudo apt-get liblzma-dev
+
+Then pass `"CONFIG+=zim_support"` to `qmake`
+
+    qmake "CONFIG+=zim_support"
+
+### Building without extra tiff handler
+
+If you have problem building with libtiff5-dev package, you can pass
+`"CONFIG+=no_extra_tiff_handler"` to `qmake` in order to disable extra tiff support
+(without such extra support some b/w tiff images will not be displayed):
+
+    qmake "CONFIG+=no_extra_tiff_handler"
+
+### Building without Epwing format support
+
+If you have problem building with libeb-dev package, you can pass
+`"CONFIG+=no_epwing_support"` to `qmake` in order to disable Epwing format support
+
+    qmake "CONFIG+=no_epwing_support"
+
 ### Building without internal audio player
 
 If you have problem building with FFmpeg/libao (for example, Ubuntu older than 12.04), you can pass
@@ -41,6 +67,11 @@
 
     qmake "DISABLE_INTERNAL_PLAYER=1"
 
+<b>NB:</b> All additional settings for `qmake` that you need must be combined in one `qmake` launch, for example:
+
+    qmake "CONFIG+=zim_support" "CONFIG+=no_extra_tiff_handler" "DISABLE_INTERNAL_PLAYER=1"
+
+
 Then, invoke `make clean` before `make` because the setting change:
 
     make clean && make
diff -Nru goldendict-1.5.0~git20131003/redist/goldendict.desktop goldendict-1.5.0~git20150923/redist/goldendict.desktop
--- goldendict-1.5.0~git20131003/redist/goldendict.desktop	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/redist/goldendict.desktop	2015-09-23 08:26:24.000000000 +0000
@@ -6,5 +6,5 @@
 GenericName=Multiformat Dictionary
 Comment=GoldenDict
 Encoding=UTF-8
-Icon=/usr/share/pixmaps/goldendict.png
+Icon=goldendict
 Exec=goldendict
diff -Nru goldendict-1.5.0~git20131003/resources.qrc goldendict-1.5.0~git20150923/resources.qrc
--- goldendict-1.5.0~git20131003/resources.qrc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/resources.qrc	2015-09-23 08:26:24.000000000 +0000
@@ -10,6 +10,7 @@
         <file>icons/addtab.png</file>
         <file>icons/next.png</file>
         <file>icons/previous.png</file>
+        <file>icons/home.png</file>
         <file>icons/reload.png</file>
         <file>icons/programicon.png</file>
         <file>icons/programicon_scan.png</file>
@@ -76,5 +77,7 @@
         <file>icons/playsound_color.png</file>
         <file>icons/playsound_full.png</file>
         <file>icons/icon32_zim.png</file>
+        <file>icons/icon32_epwing.png</file>
+        <file>icons/icon32_slob.png</file>
     </qresource>
 </RCC>
diff -Nru goldendict-1.5.0~git20131003/romaji.cc goldendict-1.5.0~git20150923/romaji.cc
--- goldendict-1.5.0~git20131003/romaji.cc	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/romaji.cc	2015-09-23 08:26:24.000000000 +0000
@@ -81,7 +81,8 @@
   ins( "tsa", "ツァ" ); ins( "tse", "ツェ" ); ins( "tso", "ツォ" ); 
   ins( "fa", "ファ" ); ins( "fi", "フィ" ); ins( "fe", "フェ" ); ins( "fo", "フォ" ); 
   ins( "fyu", "フュ" ); 
-
+  // Long vowel mark
+  ins( "-", "ー" );
   // Double consonants
 
   ins( "kka", "ッカ" ); ins( "kki", "ッキ" ); ins( "kku", "ック" ); ins( "kke", "ッケ" ); ins( "kko", "ッコ" ); ins( "kkya", "ッキャ" ); ins( "kkyu", "ッキュ" ); ins( "kkyo", "ッキョ" );
diff -Nru goldendict-1.5.0~git20131003/scanpopup.cc goldendict-1.5.0~git20150923/scanpopup.cc
--- goldendict-1.5.0~git20131003/scanpopup.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/scanpopup.cc	2015-09-23 08:26:24.000000000 +0000
@@ -11,9 +11,10 @@
 #include <QMenu>
 #include <QMouseEvent>
 #include <QDesktopWidget>
-#include "dprintf.hh"
+#include "gddebug.hh"
+#include "gestures.hh"
 
-#ifdef Q_OS_MACX
+#ifdef Q_OS_MAC
 #include "macmouseover.hh"
 #define MouseOver MacMouseOver
 #else
@@ -26,7 +27,7 @@
 /// in their behavior on those platforms.
 static Qt::WindowFlags popupWindowFlags =
 
-#ifdef Q_WS_WIN
+#if defined (Q_OS_WIN) || defined (Q_OS_MAC)
 Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
 #else
 Qt::Popup
@@ -48,6 +49,7 @@
   escapeAction( this ),
   switchExpandModeAction( this ),
   focusTranslateLineAction( this ),
+  openSearchAction( this ),
   wordFinder( this ),
   dictionaryBar( this, configEvents, cfg.editDictionaryCommandLine, cfg.preferences.maxDictionaryRefsInContextMenu ),
   mouseEnteredOnce( false ),
@@ -56,12 +58,22 @@
 {
   ui.setupUi( this );
 
+  openSearchAction.setShortcut( QKeySequence( "Ctrl+F" ) );
+
+  if( layoutDirection() == Qt::RightToLeft )
+  {
+    // Adjust button icons for Right-To-Left layout
+    ui.goBackButton->setIcon( QIcon( ":/icons/next.png" ) );
+    ui.goForwardButton->setIcon( QIcon( ":/icons/previous.png" ) );
+  }
+
   mainStatusBar = new MainStatusBar( this );
 
   ui.queryError->hide();
 
   definition = new ArticleView( ui.outerFrame, articleNetMgr, allDictionaries,
                                 groups, true, cfg,
+                                openSearchAction,
                                 dictionaryBar.toggleViewAction()
                                 );
 
@@ -213,6 +225,10 @@
 #ifdef Q_WS_X11
   connect( QApplication::clipboard(), SIGNAL( changed( QClipboard::Mode ) ),
            this, SLOT( clipboardChanged( QClipboard::Mode ) ) );
+#else
+  if( cfg.preferences.trackClipboardChanges )
+    connect( QApplication::clipboard(), SIGNAL( changed( QClipboard::Mode ) ),
+             this, SLOT( clipboardChanged( QClipboard::Mode ) ) );
 #endif
 
   connect( &MouseOver::instance(), SIGNAL( hovered( QString const &, bool ) ),
@@ -251,6 +267,10 @@
   ui.goBackButton->setEnabled( false );
   ui.goForwardButton->setEnabled( false );
 
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  grabGesture( Gestures::GDPinchGestureType );
+  grabGesture( Gestures::GDSwipeGestureType );
+#endif
 }
 
 ScanPopup::~ScanPopup()
@@ -261,6 +281,11 @@
   cfg.pinPopupWindow = ui.pinButton->isChecked();
 
   disableScanning();
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+  ungrabGesture( Gestures::GDPinchGestureType );
+  ungrabGesture( Gestures::GDSwipeGestureType );
+#endif
 }
 
 void ScanPopup::enableScanning()
@@ -303,7 +328,7 @@
 
 void ScanPopup::translateWordFromClipboard(QClipboard::Mode m)
 {
-  DPRINTF( "translating from clipboard or selection\n" );
+  GD_DPRINTF( "translating from clipboard or selection\n" );
 
   QString subtype = "plain";
 
@@ -339,7 +364,7 @@
   if ( !isScanningEnabled )
     return;
   
-  DPRINTF( "clipboard changed\n" );
+  GD_DPRINTF( "clipboard changed\n" );
 
   QString subtype = "plain";
 
@@ -404,10 +429,6 @@
 
   definition->setSelectionBySingleClick( cfg.preferences.selectWordBySingleClick );
 
-  /// Too large strings make window expand which is probably not what user
-  /// wants
-  ui.translateBox->setText( inputWord, false );
- 
   if ( !isVisible() )
   {
     // Need to show the window
@@ -479,6 +500,10 @@
   if ( ui.pinButton->isChecked() )
        setWindowTitle( tr( "%1 - %2" ).arg( elideInputWord(), "GoldenDict" ) );
 
+  /// Too large strings make window expand which is probably not what user
+  /// wants
+  ui.translateBox->setText( inputWord, false );
+
   showTranslationFor( inputWord );
 }
 
@@ -976,6 +1001,9 @@
 
 void ScanPopup::mutedDictionariesChanged()
 {
+  // Update suggestion list
+  translateInputChanged( ui.translateBox->translateLine()->text() );
+
   if ( dictionaryBar.toggleViewAction()->isChecked() )
     definition->updateMutedContents();
 }
diff -Nru goldendict-1.5.0~git20131003/scanpopup.hh goldendict-1.5.0~git20150923/scanpopup.hh
--- goldendict-1.5.0~git20131003/scanpopup.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/scanpopup.hh	2015-09-23 08:26:24.000000000 +0000
@@ -107,6 +107,7 @@
   Ui::ScanPopup ui;
   ArticleView * definition;
   QAction escapeAction, switchExpandModeAction, focusTranslateLineAction;
+  QAction openSearchAction;
   QString pendingInputWord, inputWord;
   WordFinder wordFinder;
   Config::Events configEvents;
diff -Nru goldendict-1.5.0~git20131003/scanpopup.ui goldendict-1.5.0~git20150923/scanpopup.ui
--- goldendict-1.5.0~git20131003/scanpopup.ui	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/scanpopup.ui	2015-09-23 08:26:24.000000000 +0000
@@ -14,6 +14,12 @@
    <string>Dialog</string>
   </property>
   <widget class="QWidget" name="centralWidget">
+   <property name="minimumSize">
+    <size>
+     <width>280</width>
+     <height>100</height>
+    </size>
+   </property>
    <layout class="QHBoxLayout" name="horizontalLayout_222">
     <property name="leftMargin">
      <number>0</number>
@@ -173,7 +179,7 @@
              </property>
              <property name="sizeHint" stdset="0">
               <size>
-               <width>40</width>
+               <width>0</width>
                <height>20</height>
               </size>
              </property>
diff -Nru goldendict-1.5.0~git20131003/sdict.cc goldendict-1.5.0~git20150923/sdict.cc
--- goldendict-1.5.0~git20131003/sdict.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/sdict.cc	2015-09-23 08:26:24.000000000 +0000
@@ -7,10 +7,12 @@
 #include "utf8.hh"
 #include "chunkedstorage.hh"
 #include "langcoder.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "fsencoding.hh"
 #include "decompress.hh"
 #include "htmlescape.hh"
+#include "ftshelpers.hh"
+#include "wstring_qt.hh"
 
 #include <map>
 #include <set>
@@ -122,7 +124,7 @@
 
 class SdictDictionary: public BtreeIndexing::BtreeDictionary
 {
-    Mutex idxMutex;
+    Mutex idxMutex, sdictMutex;
     File::Class idx;
     IdxHeader idxHeader;
     ChunkedStorage::Reader chunks;
@@ -159,6 +161,22 @@
                                                         wstring const & )
       throw( std::exception );
 
+    virtual QString const & getDescription();
+
+    virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                              int searchMode, bool matchCase,
+                                                              int distanceBetweenWords,
+                                                              int maxResults );
+    virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+    virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+    virtual void setFTSParameters( Config::FullTextSearch const & fts )
+    {
+      can_FTS = fts.enabled
+                && !fts.disabledTypes.contains( "SDICT", Qt::CaseInsensitive )
+                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    }
 protected:
 
     void loadIcon() throw();
@@ -194,6 +212,16 @@
     openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
                           idxHeader.indexRootOffset ),
                idx, idxMutex );
+
+    // Full-text search parameters
+
+    can_FTS = true;
+
+    ftsIdxName = indexFile + "_FTS";
+
+    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+      FTS_index_completed.ref();
 }
 
 SdictDictionary::~SdictDictionary()
@@ -330,10 +358,13 @@
 
     vector< char > articleBody;
 
-    df.seek( articleOffset );
-    df.read( &articleSize, sizeof(articleSize) );
-    articleBody.resize( articleSize );
-    df.read( &articleBody.front(), articleSize );
+    {
+      Mutex::Lock _( sdictMutex );
+      df.seek( articleOffset );
+      df.read( &articleSize, sizeof(articleSize) );
+      articleBody.resize( articleSize );
+      df.read( &articleBody.front(), articleSize );
+    }
 
     if ( articleBody.empty() )
       throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
@@ -356,6 +387,69 @@
     articleText.append( "</div>" );
 }
 
+void SdictDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "SDict: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "SDict: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void SdictDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    string articleStr;
+    headword.clear();
+    text.clear();
+
+    loadArticle( articleAddress, articleStr );
+
+    try
+    {
+      wstring wstr = Utf8::decode( articleStr );
+      text = Html::unescape( gd::toQString( wstr ) );
+    }
+    catch( std::exception & )
+    {
+    }
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "SDict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+sptr< Dictionary::DataRequest > SdictDictionary::getSearchResults( QString const & searchString,
+                                                                   int searchMode, bool matchCase,
+                                                                   int distanceBetweenWords,
+                                                                   int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 /// SdictDictionary::getArticle()
 
 class SdictArticleRequest;
@@ -489,7 +583,7 @@
     }
     catch( std::exception &ex )
     {
-      qWarning( "SDict: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      gdWarning( "SDict: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
     }
   }
 
@@ -543,6 +637,71 @@
   return new SdictArticleRequest( word, alts, *this );
 }
 
+QString const& SdictDictionary::getDescription()
+{
+  if( !dictionaryDescription.isEmpty() )
+    return dictionaryDescription;
+
+  dictionaryDescription = QString::fromLatin1( "Title: " )
+                          + QString::fromUtf8( getName().c_str() );
+
+  try
+  {
+    Mutex::Lock _( sdictMutex );
+
+    DCT_header dictHeader;
+
+    df.seek( 0 );
+    if( df.readRecords( &dictHeader, sizeof(dictHeader), 1 ) != 1 )
+      throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
+
+    int compression = dictHeader.compression & 0x0F;
+
+    vector< char > data;
+    uint32_t size;
+    string str;
+
+    df.seek( dictHeader.copyrightOffset );
+    df.read( &size, sizeof( size ) );
+    data.resize( size );
+    df.read( &data.front(), size );
+
+    if( compression == 1 )
+      str = decompressZlib( data.data(), size );
+    else if( compression == 2 )
+      str = decompressBzip2( data.data(), size );
+    else
+      str = string( data.data(), size );
+
+    dictionaryDescription += QString::fromLatin1( "\n\nCopyright: " )
+                             + QString::fromUtf8( str.c_str(), str.size() );
+
+    df.seek( dictHeader.versionOffset );
+    df.read( &size, sizeof( size ) );
+    data.resize( size );
+    df.read( &data.front(), size );
+
+    if( compression == 1 )
+      str = decompressZlib( data.data(), size );
+    else if( compression == 2 )
+      str = decompressBzip2( data.data(), size );
+    else
+      str = string( data.data(), size );
+
+    dictionaryDescription += QString::fromLatin1( "\n\nVersion: " )
+                             + QString::fromUtf8( str.c_str(), str.size() );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "SDict: Failed description reading for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+
+  if( dictionaryDescription.isEmpty() )
+    dictionaryDescription = "NONE";
+
+  return dictionaryDescription;
+}
+
 } // anonymous namespace
 
 vector< sptr< Dictionary::Class > > makeDictionaries(
@@ -575,7 +734,7 @@
       {
         try
         {
-          qDebug( "SDict: Building the index for dictionary: %s\n", i->c_str() );
+          gdDebug( "SDict: Building the index for dictionary: %s\n", i->c_str() );
 
           File::Class df( *i, "rb" );
 
@@ -584,7 +743,7 @@
           df.read( &dictHeader, sizeof(dictHeader) );
           if( strncmp( dictHeader.signature, "sdct", 4 ) )
           {
-              qWarning( "File \"%s\" is not valid SDictionary file", i->c_str() );
+              gdWarning( "File \"%s\" is not valid SDictionary file", i->c_str() );
               continue;
           }
           int compression = dictHeader.compression & 0x0F;
@@ -681,8 +840,8 @@
         }
         catch( std::exception & e )
         {
-          qWarning( "Sdictionary dictionary indexing failed: %s, error: %s\n",
-                    i->c_str(), e.what() );
+          gdWarning( "Sdictionary dictionary indexing failed: %s, error: %s\n",
+                     i->c_str(), e.what() );
           continue;
         }
         catch( ... )
@@ -691,9 +850,17 @@
           continue;
         }
       } // if need to rebuild
-      dictionaries.push_back( new SdictDictionary( dictId,
-                                                   indexFile,
-                                                   dictFiles ) );
+      try
+      {
+        dictionaries.push_back( new SdictDictionary( dictId,
+                                                     indexFile,
+                                                     dictFiles ) );
+      }
+      catch( std::exception & e )
+      {
+        gdWarning( "Sdictionary dictionary initializing failed: %s, error: %s\n",
+                   i->c_str(), e.what() );
+      }
   }
   return dictionaries;
 }
diff -Nru goldendict-1.5.0~git20131003/slob.cc goldendict-1.5.0~git20150923/slob.cc
--- goldendict-1.5.0~git20131003/slob.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/slob.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,1560 @@
+/* This file is (c) 2015 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#ifdef MAKE_ZIM_SUPPORT
+
+#include "slob.hh"
+#include "btreeidx.hh"
+#include "fsencoding.hh"
+#include "folding.hh"
+#include "gddebug.hh"
+#include "utf8.hh"
+#include "decompress.hh"
+#include "langcoder.hh"
+#include "wstring.hh"
+#include "wstring_qt.hh"
+#include "ftshelpers.hh"
+#include "htmlescape.hh"
+#include "filetype.hh"
+#include "tiff.hh"
+
+#ifdef _MSC_VER
+#include <stub_msvc.h>
+#endif
+
+#include <QString>
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
+#include <QTextCodec>
+#include <QMap>
+#include <QPair>
+#include <QRegExp>
+#include <QProcess>
+
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+
+namespace Slob {
+
+using std::string;
+using std::map;
+using std::vector;
+using std::multimap;
+using std::pair;
+using std::set;
+using gd::wstring;
+
+using BtreeIndexing::WordArticleLink;
+using BtreeIndexing::IndexedWords;
+using BtreeIndexing::IndexInfo;
+
+DEF_EX_STR( exNotSlobFile, "Not an Slob file", Dictionary::Ex )
+DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+DEF_EX_STR( exCantDecodeFile, "Can't decode file", Dictionary::Ex )
+DEF_EX_STR( exNoCodecFound, "No text codec found", Dictionary::Ex )
+DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
+DEF_EX( exNoResource, "No resource found", Dictionary::Ex )
+
+#pragma pack( push, 1 )
+
+enum
+{
+  Signature = 0x58424C53, // SLBX on little-endian, XBLS on big-endian
+  CurrentFormatVersion = 1 + BtreeIndexing::FormatVersion + Folding::Version
+};
+
+struct IdxHeader
+{
+  quint32 signature; // First comes the signature, SLBX
+  quint32 formatVersion; // File format version (CurrentFormatVersion)
+  quint32 indexBtreeMaxElements; // Two fields from IndexInfo
+  quint32 indexRootOffset;
+  quint32 resourceIndexBtreeMaxElements; // Two fields from IndexInfo
+  quint32 resourceIndexRootOffset;
+  quint32 wordCount;
+  quint32 articleCount;
+  quint32 langFrom;  // Source language
+  quint32 langTo;    // Target language
+}
+#ifndef _MSC_VER
+__attribute__((packed))
+#endif
+;
+
+#pragma pack( pop )
+
+const char SLOB_MAGIC[ 8 ] = { 0x21, 0x2d, 0x31, 0x53, 0x4c, 0x4f, 0x42, 0x1f };
+
+struct RefEntry
+{
+  QString key;
+  quint32 binIndex;
+  quint16 itemIndex;
+  QString fragment;
+};
+
+bool indexIsOldOrBad( string const & indexFile )
+{
+  File::Class idx( indexFile, "rb" );
+
+  IdxHeader header;
+
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
+         header.signature != Signature ||
+         header.formatVersion != CurrentFormatVersion;
+}
+
+
+class SlobFile
+{
+  enum Compressions
+  { UNKNOWN = 0, ZLIB, BZ2, LZMA2 };
+
+  QFile file;
+  QString fileName, dictionaryName;
+  Compressions compression;
+  QString encoding;
+  unsigned char uuid[ 16 ];
+  QTextCodec *codec;
+  QMap< QString, QString > tags;
+  QVector< QString > contentTypes;
+  quint32 blobCount;
+  quint64 storeOffset, fileSize, refsOffset;
+  quint32 refsCount, itemsCount;
+  quint64 itemsOffset, itemsDataOffset;
+  quint32 currentItem;
+  quint32 contentTypesCount;
+  string currentItemData;
+
+  QString readTinyText();
+  QString readText();
+  QString readLargeText();
+  QString readString( unsigned lenght );
+
+public:
+  SlobFile() :
+    compression( UNKNOWN )
+  , codec( 0 )
+  , blobCount( 0 )
+  , storeOffset( 0 )
+  , fileSize( 0 )
+  , refsOffset( 0 )
+  , refsCount( 0 )
+  , itemsCount( 0 )
+  , itemsOffset( 0 )
+  , itemsDataOffset( 0 )
+  , currentItem( 0xFFFFFFFF )
+  , contentTypesCount( 0 )
+  {}
+
+  ~SlobFile();
+
+  Compressions getCompression() const
+  { return compression; }
+
+  QString const & getEncoding() const
+  { return encoding; }
+
+  QString const & getDictionaryName() const
+  { return dictionaryName; }
+
+  quint32 blobsCount() const
+  { return blobCount; }
+
+  quint64 dataOffset() const
+  { return storeOffset; }
+
+  quint32 getRefsCount() const
+  { return refsCount; }
+
+  quint32 getContentTypesCount() const
+  { return contentTypesCount; }
+
+  QTextCodec * getCodec() const
+  { return codec; }
+
+  QString getContentType( quint8 content_id ) const
+  { return content_id < contentTypes.size() ? contentTypes[ content_id ] : QString(); }
+
+  QMap< QString, QString > const & getTags() const
+  { return tags; }
+
+  void open( const QString & name );
+
+  void getRefEntry( quint32 ref_nom, RefEntry & entry );
+
+  quint8 getItem( RefEntry const & entry, string * data );
+};
+
+SlobFile::~SlobFile()
+{
+  file.close();
+}
+
+QString SlobFile::readString( unsigned length )
+{
+  QByteArray data = file.read( length );
+  QString str;
+
+  if( codec != 0 && !data.isEmpty() )
+    str = codec->toUnicode( data );
+  else
+    str = QString( data );
+
+  char term = 0;
+  int n = str.indexOf( term );
+  if( n > 0 )
+    str.resize( n );
+
+  return str;
+}
+
+QString SlobFile::readTinyText()
+{
+  unsigned char len;
+  if( !file.getChar( ( char * )&len ) )
+  {
+    QString error = fileName + ": " + file.errorString();
+    throw exCantReadFile( string( error.toUtf8().data() ) );
+  }
+  return readString( len );
+}
+
+QString SlobFile::readText()
+{
+  quint16 len;
+  if( file.read( ( char * )&len, sizeof( len ) ) != sizeof( len ) )
+  {
+    QString error = fileName + ": " + file.errorString();
+    throw exCantReadFile( string( error.toUtf8().data() ) );
+  }
+  return readString( qFromBigEndian( len ) );
+}
+
+QString SlobFile::readLargeText()
+{
+  quint32 len;
+  if( file.read( ( char * )&len, sizeof( len ) ) != sizeof( len ) )
+  {
+    QString error = fileName + ": " + file.errorString();
+    throw exCantReadFile( string( error.toUtf8().data() ) );
+  }
+  return readString( qFromBigEndian( len ) );
+}
+
+void SlobFile::open( const QString & name )
+{
+QString error( name + ": " );
+
+  if( file.isOpen() )
+    file.close();
+
+  fileName = name;
+
+  file.setFileName( name );
+
+  {
+    QFileInfo fi( name );
+    dictionaryName = fi.fileName();
+  }
+
+  for( ; ; )
+  {
+
+    if( !file.open( QFile::ReadOnly ) )
+      break;
+
+    char magic[ 8 ];
+    if( file.read( magic, sizeof( magic ) ) != sizeof( magic ) )
+      break;
+
+    if( memcmp( magic, SLOB_MAGIC, sizeof( magic ) ) != 0 )
+      throw exNotSlobFile( string( name.toUtf8().data() ) );
+
+    if( file.read( ( char * )uuid, sizeof( uuid ) ) != sizeof( uuid ) )
+      break;
+
+    // Read encoding
+
+    encoding = readTinyText();
+
+    codec = QTextCodec::codecForName( encoding.toLatin1() );
+    if( codec == 0 )
+    {
+      error = QString( "for encoding \"") + encoding + "\"";
+      throw exNoCodecFound( string( error.toUtf8().data() ) );
+    }
+
+    // Read compression type
+
+    QString compr = readTinyText();
+
+    if( compr.compare( "zlib", Qt::CaseInsensitive ) == 0 )
+      compression = ZLIB;
+    else
+    if( compr.compare( "bz2", Qt::CaseInsensitive ) == 0 )
+      compression = BZ2;
+    else
+    if( compr.compare( "lzma2", Qt::CaseInsensitive ) == 0 )
+      compression = LZMA2;
+
+    // Read tags
+
+    unsigned char count;
+    if( !file.getChar( ( char * )&count ) )
+      break;
+
+    for( unsigned i = 0; i < count; i++ )
+    {
+      QString key = readTinyText();
+      QString value = readTinyText();
+      tags[ key ] = value;
+
+      if( key.compare( "label", Qt::CaseInsensitive ) == 0
+          || key.compare( "name", Qt::CaseInsensitive ) == 0)
+        dictionaryName = value;
+    }
+
+    // Read content types
+
+    if( !file.getChar( ( char * )&count ) )
+      break;
+
+    for( unsigned i = 0; i < count; i++ )
+    {
+      QString type = readText();
+      contentTypes.append( type );
+    }
+    contentTypesCount = count;
+
+    // Read data parameters
+
+    quint32 cnt;
+    if( file.read( ( char * )&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
+      break;
+    blobCount = qFromBigEndian( cnt );
+
+    quint64 tmp;
+    if( file.read( ( char * )&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
+      break;
+    storeOffset = qFromBigEndian( tmp );
+
+    if( file.read( ( char * )&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
+      break;
+    fileSize = qFromBigEndian( tmp );
+
+    if( file.read( ( char * )&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
+      break;
+    refsCount = qFromBigEndian( cnt );
+
+    refsOffset = file.pos();
+
+    if( !file.seek( storeOffset ) )
+      break;
+
+    if( file.read( ( char * )&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
+      break;
+    itemsCount = qFromBigEndian( cnt );
+
+    itemsOffset = storeOffset + sizeof( itemsCount );
+    itemsDataOffset = itemsOffset + itemsCount * sizeof( quint64 );
+
+    return;
+  }
+  error += file.errorString();
+  throw exCantReadFile( string( error.toUtf8().data() ) );
+}
+
+void SlobFile::getRefEntry( quint32 ref_nom, RefEntry & entry )
+{
+  quint64 pos = refsOffset + ref_nom * sizeof( quint64 );
+  quint64 offset, tmp;
+
+  for( ; ; )
+  {
+    if( !file.seek( pos ) || file.read( ( char * )&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
+      break;
+    offset = qFromBigEndian( tmp ) + refsOffset + refsCount * sizeof( quint64 );
+
+    if( !file.seek( offset ) )
+      break;
+
+    entry.key = readText();
+
+    quint32 index;
+    if( file.read( ( char * )&index, sizeof( index ) ) != sizeof( index ) )
+      break;
+    entry.itemIndex = qFromBigEndian( index );
+
+    quint16 binIndex;
+    if( file.read( ( char * )&binIndex, sizeof( binIndex ) ) != sizeof( binIndex ) )
+      break;
+    entry.binIndex = qFromBigEndian( binIndex );
+
+    entry.fragment = readTinyText();
+
+    return;
+  }
+  QString error = fileName + ": " + file.errorString();
+  throw exCantReadFile( string( error.toUtf8().data() ) );
+}
+
+quint8 SlobFile::getItem( RefEntry const & entry, string * data )
+{
+  quint64 pos = itemsOffset + entry.itemIndex * sizeof( quint64 );
+  quint64 offset, tmp;
+
+  for( ; ; )
+  {
+    // Read item data types
+
+    if( !file.seek( pos ) || file.read( ( char * )&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
+      break;
+
+    offset = qFromBigEndian( tmp ) + itemsDataOffset;
+
+    if( !file.seek( offset ) )
+      break;
+
+    quint32 bins, bins_be;
+    if( file.read( ( char * )&bins_be, sizeof( bins_be ) ) != sizeof( bins_be ) )
+      break;
+    bins = qFromBigEndian( bins_be );
+
+    if( entry.binIndex >= bins )
+      return 0xFF;
+
+    QVector< quint8 > ids;
+    ids.resize( bins );
+    if( file.read( ( char * )ids.data(), bins ) != bins )
+      break;
+
+    quint8 id = ids[ entry.binIndex ];
+
+    if( id >= (unsigned)contentTypes.size() )
+      return 0xFF;
+
+    if( data != 0 )
+    {
+      // Read item data
+      if( currentItem != entry.itemIndex )
+      {
+        currentItemData.clear();
+        quint32 length, length_be;
+        if( file.read( ( char * )&length_be, sizeof( length_be ) ) != sizeof( length_be ) )
+          break;
+        length = qFromBigEndian( length_be );
+
+        QByteArray compressedData = file.read( length );
+
+        if( compression == ZLIB )
+          currentItemData = decompressZlib( compressedData.data(), length );
+        else
+        if( compression == ZLIB )
+          currentItemData = decompressBzip2( compressedData.data(), length );
+        else
+          currentItemData = decompressLzma2( compressedData.data(), length, true );
+
+        if( currentItemData.empty() )
+        {
+          currentItem = 0xFFFFFFFF;
+          return 0xFF;
+        }
+        currentItem = entry.itemIndex;
+      }
+
+      // Find bin data inside item
+
+      const char * ptr = currentItemData.c_str();
+      quint32 pos = entry.binIndex * sizeof( quint32 );
+
+      if( pos >= currentItemData.length() - sizeof( quint32 ) )
+        return 0xFF;
+
+      quint32 offset, offset_be;
+      memcpy( &offset_be, ptr + pos, sizeof( offset_be ) );
+      offset = qFromBigEndian( offset_be );
+
+      pos = bins * sizeof( quint32 ) + offset;
+
+      if( pos >= currentItemData.length() - sizeof( quint32 ) )
+        return 0xFF;
+
+      quint32 length, len_be;
+      memcpy( &len_be, ptr + pos, sizeof( len_be ) );
+      length = qFromBigEndian( len_be );
+
+      *data = currentItemData.substr( pos + sizeof( len_be ), length );
+    }
+
+    return ids[ entry.binIndex ];
+  }
+  QString error = fileName + ": " + file.errorString();
+  throw exCantReadFile( string( error.toUtf8().data() ) );
+}
+
+// SlobDictionary
+
+class SlobDictionary: public BtreeIndexing::BtreeDictionary
+{
+    Mutex idxMutex;
+    Mutex slobMutex, idxResourceMutex;
+    File::Class idx;
+    BtreeIndex resourceIndex;
+    IdxHeader idxHeader;
+    string dictionaryName;
+    SlobFile sf;
+    QString texCgiPath, texCachePath;
+
+  public:
+
+    SlobDictionary( string const & id, string const & indexFile,
+                    vector< string > const & dictionaryFiles );
+
+    ~SlobDictionary();
+
+    virtual string getName() throw()
+    { return dictionaryName; }
+
+    virtual map< Dictionary::Property, string > getProperties() throw()
+    { return map< Dictionary::Property, string >(); }
+
+    virtual unsigned long getArticleCount() throw()
+    { return idxHeader.articleCount; }
+
+    virtual unsigned long getWordCount() throw()
+    { return idxHeader.wordCount; }
+
+    inline virtual quint32 getLangFrom() const
+    { return idxHeader.langFrom; }
+
+    inline virtual quint32 getLangTo() const
+    { return idxHeader.langTo; }
+
+    virtual sptr< Dictionary::DataRequest > getArticle( wstring const &,
+                                                        vector< wstring > const & alts,
+                                                        wstring const & )
+      throw( std::exception );
+
+    virtual sptr< Dictionary::DataRequest > getResource( string const & name )
+      throw( std::exception );
+
+    virtual QString const& getDescription();
+
+    /// Loads the resource.
+    void loadResource( std::string &resourceName, string & data );
+
+    virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                              int searchMode, bool matchCase,
+                                                              int distanceBetweenWords,
+                                                              int maxResults );
+    virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+    virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+    virtual void setFTSParameters( Config::FullTextSearch const & fts )
+    {
+      can_FTS = fts.enabled
+                && !fts.disabledTypes.contains( "SLOB", Qt::CaseInsensitive )
+                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    }
+
+    virtual uint32_t getFtsIndexVersion()
+    { return 1; }
+
+protected:
+
+    virtual void loadIcon() throw();
+
+private:
+
+    /// Loads the article.
+    void loadArticle( quint32 address,
+                      string & articleText );
+
+    quint32 readArticle( quint32 address,
+                         string & articleText,
+                         RefEntry & entry );
+
+    string convert( string const & in_data, RefEntry const & entry );
+
+    void removeDirectory( QString const & directory );
+
+    friend class SlobArticleRequest;
+    friend class SlobResourceRequest;
+};
+
+SlobDictionary::SlobDictionary( string const & id,
+                                string const & indexFile,
+                                vector< string > const & dictionaryFiles ):
+    BtreeDictionary( id, dictionaryFiles ),
+    idx( indexFile, "rb" ),
+    idxHeader( idx.read< IdxHeader >() )
+{
+    // Open data file
+
+    try
+    {
+      sf.open( FsEncoding::decode( dictionaryFiles[ 0 ].c_str() ) );
+    }
+    catch( std::exception & e )
+    {
+      gdWarning( "Slob dictionary initializing failed: %s, error: %s\n",
+                 dictionaryFiles[ 0 ].c_str(), e.what() );
+    }
+
+    // Initialize the indexes
+
+    openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
+                          idxHeader.indexRootOffset ),
+               idx, idxMutex );
+
+    resourceIndex.openIndex( IndexInfo( idxHeader.resourceIndexBtreeMaxElements,
+                                        idxHeader.resourceIndexRootOffset ),
+                             idx, idxResourceMutex );
+
+    // Read dictionary name
+
+    dictionaryName = string( sf.getDictionaryName().toUtf8().constData() );
+    if( dictionaryName.empty() )
+    {
+      QString name = QDir::fromNativeSeparators( FsEncoding::decode( dictionaryFiles[ 0 ].c_str() ) );
+      int n = name.lastIndexOf( '/' );
+      dictionaryName = string( name.mid( n + 1 ).toUtf8().constData() );
+    }
+
+    // Full-text search parameters
+
+    can_FTS = true;
+
+    ftsIdxName = indexFile + "_FTS";
+
+    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+      FTS_index_completed.ref();
+
+    texCgiPath = Config::getProgramDataDir() + "/mimetex.cgi";
+    if( QFileInfo( texCgiPath ).exists() )
+    {
+      QString dirName = QString::fromStdString( getId() );
+      QDir( QDir::tempPath() ).mkdir( dirName );
+      texCachePath = QDir::tempPath() + "/" + dirName;
+    }
+    else
+      texCgiPath.clear();
+}
+
+SlobDictionary::~SlobDictionary()
+{
+  if( !texCachePath.isEmpty() )
+    removeDirectory( texCachePath );
+}
+
+void SlobDictionary::removeDirectory( QString const & directory )
+{
+  QDir dir( directory );
+  Q_FOREACH( QFileInfo info, dir.entryInfoList( QDir::NoDotAndDotDot
+                                                | QDir::AllDirs
+                                                | QDir::Files,
+                                                QDir::DirsFirst))
+  {
+    if( info.isDir() )
+      removeDirectory( info.absoluteFilePath() );
+    else
+      QFile::remove( info.absoluteFilePath() );
+  }
+
+  dir.rmdir( directory );
+}
+
+void SlobDictionary::loadIcon() throw()
+{
+  if ( dictionaryIconLoaded )
+    return;
+
+  QString fileName =
+    QDir::fromNativeSeparators( FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() ) );
+
+  // Remove the extension
+  fileName.chop( 4 );
+
+  if( !loadIconFromFile( fileName ) )
+  {
+    // Load failed -- use default icons
+    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_slob.png");
+  }
+
+  dictionaryIconLoaded = true;
+}
+
+QString const& SlobDictionary::getDescription()
+{
+  if( !dictionaryDescription.isEmpty() )
+    return dictionaryDescription;
+
+  QMap< QString, QString > const & tags = sf.getTags();
+
+  QMap< QString, QString >::const_iterator it;
+  for( it = tags.begin(); it != tags.end(); ++it )
+  {
+    if( it != tags.begin() )
+      dictionaryDescription += "\n\n";
+
+    dictionaryDescription += it.key() + ": " +it.value();
+  }
+
+  return dictionaryDescription;
+}
+
+void SlobDictionary::loadArticle( quint32 address,
+                                  string & articleText )
+{
+  articleText.clear();
+
+  RefEntry entry;
+
+  readArticle( address, articleText, entry );
+
+  if( !articleText.empty() )
+  {
+    articleText = convert( articleText, entry );
+  }
+  else
+    articleText = string( QObject::tr( "Article decoding error" ).toUtf8().constData() );
+
+  // See Issue #271: A mechanism to clean-up invalid HTML cards.
+  string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
+                   "</font>""</font>""</font>""</font>""</font>""</font>"
+                   "</b></b></b></b></b></b></b></b>"
+                   "</i></i></i></i></i></i></i></i>"
+                   "</a></a></a></a></a></a></a></a>";
+
+  string prefix( "<div class=\"slobdict\"" );
+  if( isToLanguageRTL() )
+    prefix += " dir=\"rtl\"";
+  prefix += ">";
+
+  articleText = prefix + articleText + cleaner + "</div>";
+}
+
+string SlobDictionary::convert( const string & in, RefEntry const & entry )
+{
+  QString text = QString::fromUtf8( in.c_str() );
+
+  // pattern of img and script
+  text.replace( QRegExp( "<\\s*(img|script)\\s*([^>]*)src=\"(|/)([^\"]*)\"" ),
+                QString( "<\\1 \\2src=\"bres://%1/\\4\"").arg( getId().c_str() ) );
+
+  // pattern <link... href="..." ...>
+  text.replace( QRegExp( "<\\s*link\\s*([^>]*)href=\"" ),
+                QString( "<link \\1href=\"bres://%1/").arg( getId().c_str() ) );
+
+  // pattern <a href="..." ...>, excluding any known protocols such as http://, mailto:, #(comment)
+  // these links will be translated into local definitions
+  QRegExp rxLink( "<\\s*a\\s+([^>]*)href=\"(?!(\\w+://|#|mailto:|tel:))(/|)([^\"]*)\"\\s*(title=\"[^\"]*\")?[^>]*>",
+                       Qt::CaseSensitive,
+                       QRegExp::RegExp2 );
+  int pos = 0;
+  while( (pos = rxLink.indexIn( text, pos )) >= 0 )
+  {
+    QStringList list = rxLink.capturedTexts();
+    QString tag = list[3];
+    if ( !list[4].isEmpty() )
+      tag = list[4].split("\"")[1];
+
+    tag.remove( QRegExp(".*/") ).
+        remove( QRegExp( "\\.(s|)htm(l|)$", Qt::CaseInsensitive ) ).
+        replace( "_", "%20" ).
+        prepend( "<a href=\"gdlookup://localhost/" ).
+        append( "\" " + list[4] + ">" );
+
+    text.replace( pos, list[0].length(), tag );
+    pos += tag.length() + 1;
+  }
+
+  // Handle TeX formulas via mimetex.cgi
+
+  if( !texCgiPath.isEmpty() )
+  {
+    QRegExp texImage( "<\\s*img\\s*class=\"([^\"]+)\"\\s*alt=\"([^\"]+)\"[^>]*>",
+                      Qt::CaseSensitive,
+                      QRegExp::RegExp2 );
+    pos = 0;
+    unsigned texCount = 0;
+    QString imgName;
+
+    QRegExp regFrac = QRegExp( "\\\\[dt]frac" );
+
+    while( (pos = texImage.indexIn( text, pos )) >= 0 )
+    {
+      QStringList list = texImage.capturedTexts();
+
+      if( list[ 1 ].compare( "tex" ) == 0
+          || list[ 1 ].endsWith( " tex" ) )
+      {
+        QString name;
+        name.sprintf( "%04X%04X%04X.gif", entry.itemIndex, entry.binIndex, texCount );
+        imgName = texCachePath + "/" + name;
+
+        if( !QFileInfo( imgName ).exists() )
+        {
+          QString tex = list[ 2 ];
+          tex.replace( regFrac, "\\frac" );
+
+          QString command = texCgiPath + " -e " +  imgName
+                            + " \"" + tex + "\"";
+          QProcess::execute( command );
+        }
+
+        QString tag = QString( "<img class=\"imgtex\" src=\"file://" )
+#ifdef Q_OS_WIN32
+                      + "/"
+#endif
+                      + imgName + "\" alt=\"" + list[ 2 ] + "\">";
+
+        text.replace( pos, list[0].length(), tag );
+        pos += tag.length() + 1;
+
+        texCount += 1;
+      }
+      else
+        pos += list[ 0 ].length();
+    }
+  }
+
+  // Fix outstanding elements
+  text += "<br style=\"clear:both;\" />";
+
+  return text.toUtf8().data();
+}
+
+void SlobDictionary::loadResource( std::string & resourceName, string & data )
+{
+  vector< WordArticleLink > link;
+  string resData;
+  RefEntry entry;
+
+  link = resourceIndex.findArticles( Utf8::decode( resourceName ) );
+
+  if( link.empty() )
+    return;
+
+  readArticle( link[ 0 ].articleOffset, data, entry );
+}
+
+quint32 SlobDictionary::readArticle( quint32 articleNumber, std::string & result,
+                                     RefEntry & entry )
+{
+  string data;
+  quint8 contentId;
+
+  {
+    Mutex::Lock _( slobMutex );
+    if( entry.key.isEmpty() )
+      sf.getRefEntry( articleNumber, entry );
+    contentId = sf.getItem( entry, &data );
+  }
+
+  if( contentId == 0xFF )
+    return 0xFFFFFFFF;
+
+  QString contentType = sf.getContentType( contentId );
+
+  if( contentType.contains( "text/html", Qt::CaseInsensitive )
+      || contentType.contains( "text/plain", Qt::CaseInsensitive )
+      || contentType.contains( "/css", Qt::CaseInsensitive )
+      || contentType.contains( "/javascript", Qt::CaseInsensitive )
+      || contentType.contains( "/json", Qt::CaseInsensitive ))
+  {
+    QTextCodec *codec = sf.getCodec();
+    QString content = codec->toUnicode( data.c_str(), data.size() );
+    result = string( content.toUtf8().data() );
+  }
+  else
+    result = data;
+
+  return contentId;
+}
+
+void SlobDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "Slob: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    Mutex::Lock _( getFtsMutex() );
+
+    File::Class ftsIdx( ftsIndexName(), "wb" );
+
+    FtsHelpers::FtsIdxHeader ftsIdxHeader;
+    memset( &ftsIdxHeader, 0, sizeof( ftsIdxHeader ) );
+
+    // We write a dummy header first. At the end of the process the header
+    // will be rewritten with the right values.
+
+    ftsIdx.write( ftsIdxHeader );
+
+    ChunkedStorage::Writer chunks( ftsIdx );
+
+    BtreeIndexing::IndexedWords indexedWords;
+
+    QSet< uint32_t > setOfOffsets;
+
+    findArticleLinks( 0, &setOfOffsets, 0, &isCancelled );
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    QVector< uint32_t > offsets;
+    offsets.resize( setOfOffsets.size() );
+    uint32_t * ptr = &offsets.front();
+
+    for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+         it != setOfOffsets.constEnd(); ++it )
+    {
+      *ptr = *it;
+      ptr++;
+    }
+
+    // Free memory
+    setOfOffsets.clear();
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    qSort( offsets );
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    QMap< QString, QVector< uint32_t > > ftsWords;
+
+    set< quint64 > indexedArticles;
+    RefEntry entry;
+    string articleText;
+    quint32 htmlType = 0xFFFFFFFF;
+
+    for( unsigned i = 0; i < sf.getContentTypesCount(); i++ )
+    {
+      if( sf.getContentType( i ).startsWith( "text/html", Qt::CaseInsensitive ) )
+      {
+        htmlType = i;
+        break;
+      }
+    }
+
+    // index articles for full-text search
+    for( int i = 0; i < offsets.size(); i++ )
+    {
+      if( isCancelled )
+        throw exUserAbort();
+
+      QString articleStr;
+      quint32 articleNom = offsets.at( i );
+
+      sf.getRefEntry( articleNom, entry );
+
+      quint64 articleID = ( ( (quint64)entry.itemIndex ) << 32 ) | entry.binIndex;
+
+      set< quint64 >::iterator it = indexedArticles.find( articleID );
+      if( it != indexedArticles.end() )
+        continue;
+
+      indexedArticles.insert( articleID );
+
+      quint32 type = readArticle( 0, articleText, entry );
+
+      articleStr = QString::fromUtf8( articleText.c_str(), articleText.length() );
+
+      if( type == htmlType )
+        articleStr = Html::unescape( articleStr );
+
+      FtsHelpers::parseArticleForFts( articleNom, articleStr, ftsWords );
+    }
+
+    // Free memory
+    offsets.clear();
+
+    QMap< QString, QVector< uint32_t > >::iterator it = ftsWords.begin();
+    while( it != ftsWords.end() )
+    {
+      if( isCancelled )
+        throw exUserAbort();
+
+      uint32_t offset = chunks.startNewBlock();
+      uint32_t size = it.value().size();
+
+      chunks.addToBlock( &size, sizeof(uint32_t) );
+      chunks.addToBlock( it.value().data(), size * sizeof(uint32_t) );
+
+      indexedWords.addSingleWord( gd::toWString( it.key() ), offset );
+
+      it = ftsWords.erase( it );
+    }
+
+    // Free memory
+    ftsWords.clear();
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    ftsIdxHeader.chunksOffset = chunks.finish();
+    ftsIdxHeader.wordCount = indexedWords.size();
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    BtreeIndexing::IndexInfo ftsIdxInfo = BtreeIndexing::buildIndex( indexedWords, ftsIdx );
+
+    // Free memory
+    indexedWords.clear();
+
+    ftsIdxHeader.indexBtreeMaxElements = ftsIdxInfo.btreeMaxElements;
+    ftsIdxHeader.indexRootOffset = ftsIdxInfo.rootOffset;
+
+    ftsIdxHeader.signature = FtsHelpers::FtsSignature;
+    ftsIdxHeader.formatVersion = FtsHelpers::CurrentFtsFormatVersion + getFtsIndexVersion();
+
+    ftsIdx.rewind();
+    ftsIdx.writeRecords( &ftsIdxHeader, sizeof(ftsIdxHeader), 1 );
+
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Slob: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void SlobDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    RefEntry entry;
+    string articleText;
+
+    quint32 htmlType = 0xFFFFFFFF;
+
+    for( unsigned i = 0; i < sf.getContentTypesCount(); i++ )
+    {
+      if( sf.getContentType( i ).startsWith( "text/html", Qt::CaseInsensitive ) )
+      {
+        htmlType = i;
+        break;
+      }
+    }
+
+    quint32 type = readArticle( articleAddress, articleText, entry );
+    headword = entry.key;
+
+    text = QString::fromUtf8( articleText.data(), articleText.size() );
+
+    if( type == htmlType )
+      text = Html::unescape( text );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Slob: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+
+sptr< Dictionary::DataRequest > SlobDictionary::getSearchResults( QString const & searchString,
+                                                                  int searchMode, bool matchCase,
+                                                                  int distanceBetweenWords,
+                                                                  int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString, searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
+
+/// SlobDictionary::getArticle()
+
+class SlobArticleRequest;
+
+class SlobArticleRequestRunnable: public QRunnable
+{
+  SlobArticleRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  SlobArticleRequestRunnable( SlobArticleRequest & r_,
+                              QSemaphore & hasExited_ ): r( r_ ),
+                                                         hasExited( hasExited_ )
+  {}
+
+  ~SlobArticleRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class SlobArticleRequest: public Dictionary::DataRequest
+{
+  friend class SlobArticleRequestRunnable;
+
+  wstring word;
+  vector< wstring > alts;
+  SlobDictionary & dict;
+
+  QAtomicInt isCancelled;
+  QSemaphore hasExited;
+
+public:
+
+  SlobArticleRequest( wstring const & word_,
+                      vector< wstring > const & alts_,
+                      SlobDictionary & dict_ ):
+    word( word_ ), alts( alts_ ), dict( dict_ )
+  {
+    QThreadPool::globalInstance()->start(
+      new SlobArticleRequestRunnable( *this, hasExited ) );
+  }
+
+  void run(); // Run from another thread by DslArticleRequestRunnable
+
+  virtual void cancel()
+  {
+    isCancelled.ref();
+  }
+
+  ~SlobArticleRequest()
+  {
+    isCancelled.ref();
+    hasExited.acquire();
+  }
+};
+
+void SlobArticleRequestRunnable::run()
+{
+  r.run();
+}
+
+void SlobArticleRequest::run()
+{
+  if ( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  vector< WordArticleLink > chain = dict.findArticles( word );
+
+  for( unsigned x = 0; x < alts.size(); ++x )
+  {
+    /// Make an additional query for each alt
+
+    vector< WordArticleLink > altChain = dict.findArticles( alts[ x ] );
+
+    chain.insert( chain.end(), altChain.begin(), altChain.end() );
+  }
+
+  multimap< wstring, pair< string, string > > mainArticles, alternateArticles;
+
+  set< quint32 > articlesIncluded; // Some synonims make it that the articles
+                                    // appear several times. We combat this
+                                    // by only allowing them to appear once.
+
+  wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
+
+  for( unsigned x = 0; x < chain.size(); ++x )
+  {
+    if ( isCancelled )
+    {
+      finish();
+      return;
+    }
+
+    if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
+      continue; // We already have this article in the body.
+
+    // Now grab that article
+
+    string headword, articleText;
+
+    headword = chain[ x ].word;
+    try
+    {
+      dict.loadArticle( chain[ x ].articleOffset, articleText );
+    }
+    catch(...)
+    {
+    }
+
+    // Ok. Now, does it go to main articles, or to alternate ones? We list
+    // main ones first, and alternates after.
+
+    // We do the case-folded comparison here.
+
+    wstring headwordStripped =
+      Folding::applySimpleCaseOnly( Utf8::decode( headword ) );
+
+    multimap< wstring, pair< string, string > > & mapToUse =
+      ( wordCaseFolded == headwordStripped ) ?
+        mainArticles : alternateArticles;
+
+    mapToUse.insert( pair< wstring, pair< string, string > >(
+      Folding::applySimpleCaseOnly( Utf8::decode( headword ) ),
+      pair< string, string >( headword, articleText ) ) );
+
+    articlesIncluded.insert( chain[ x ].articleOffset );
+  }
+
+  if ( mainArticles.empty() && alternateArticles.empty() )
+  {
+    // No such word
+    finish();
+    return;
+  }
+
+  string result;
+
+  multimap< wstring, pair< string, string > >::const_iterator i;
+
+  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
+  {
+      result += "<h3>";
+      result += i->second.first;
+      result += "</h3>";
+      result += i->second.second;
+  }
+
+  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
+  {
+      result += "<h3>";
+      result += i->second.first;
+      result += "</h3>";
+      result += i->second.second;
+  }
+
+  Mutex::Lock _( dataMutex );
+
+  data.resize( result.size() );
+
+  memcpy( &data.front(), result.data(), result.size() );
+
+  hasAnyData = true;
+
+  finish();
+}
+
+sptr< Dictionary::DataRequest > SlobDictionary::getArticle( wstring const & word,
+                                                            vector< wstring > const & alts,
+                                                            wstring const & )
+  throw( std::exception )
+{
+  return new SlobArticleRequest( word, alts, *this );
+}
+
+//// SlobDictionary::getResource()
+
+class SlobResourceRequest;
+
+class SlobResourceRequestRunnable: public QRunnable
+{
+  SlobResourceRequest & r;
+  QSemaphore & hasExited;
+
+public:
+
+  SlobResourceRequestRunnable( SlobResourceRequest & r_,
+                               QSemaphore & hasExited_ ): r( r_ ),
+                                                          hasExited( hasExited_ )
+  {}
+
+  ~SlobResourceRequestRunnable()
+  {
+    hasExited.release();
+  }
+
+  virtual void run();
+};
+
+class SlobResourceRequest: public Dictionary::DataRequest
+{
+  friend class SlobResourceRequestRunnable;
+
+  SlobDictionary & dict;
+
+  string resourceName;
+
+  QAtomicInt isCancelled;
+  QSemaphore hasExited;
+
+public:
+
+  SlobResourceRequest( SlobDictionary & dict_,
+                       string const & resourceName_ ):
+    dict( dict_ ),
+    resourceName( resourceName_ )
+  {
+    QThreadPool::globalInstance()->start(
+      new SlobResourceRequestRunnable( *this, hasExited ) );
+  }
+
+  void run(); // Run from another thread by ZimResourceRequestRunnable
+
+  virtual void cancel()
+  {
+    isCancelled.ref();
+  }
+
+  ~SlobResourceRequest()
+  {
+    isCancelled.ref();
+    hasExited.acquire();
+  }
+};
+
+void SlobResourceRequestRunnable::run()
+{
+  r.run();
+}
+
+void SlobResourceRequest::run()
+{
+  // Some runnables linger enough that they are cancelled before they start
+  if ( isCancelled )
+  {
+    finish();
+    return;
+  }
+
+  try
+  {
+    string resource;
+    dict.loadResource( resourceName, resource );
+    if( resource.empty() )
+      throw exNoResource();
+
+    if( Filetype::isNameOfCSS( resourceName ) )
+    {
+      QString css = QString::fromUtf8( resource.data(), resource.size() );
+      dict.isolateCSS( css, ".slobdict" );
+      QByteArray bytes = css.toUtf8();
+      data.resize( bytes.size() );
+      memcpy( &data.front(), bytes.constData(), bytes.size() );
+    }
+    else
+    if ( Filetype::isNameOfTiff( resourceName ) )
+    {
+      // Convert it
+
+      dataMutex.lock();
+
+      QImage img = QImage::fromData( reinterpret_cast< const uchar * >( resource.data() ), resource.size() );
+
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+      if( img.isNull() )
+        GdTiff::tiffToQImage( &data.front(), data.size(), img );
+#endif
+
+      dataMutex.unlock();
+
+      if ( !img.isNull() )
+      {
+        // Managed to load -- now store it back as BMP
+
+        QByteArray ba;
+        QBuffer buffer( &ba );
+        buffer.open( QIODevice::WriteOnly );
+        img.save( &buffer, "BMP" );
+
+        Mutex::Lock _( dataMutex );
+
+        data.resize( buffer.size() );
+
+        memcpy( &data.front(), buffer.data(), data.size() );
+      }
+    }
+    else
+    {
+      Mutex::Lock _( dataMutex );
+      data.resize( resource.size() );
+      memcpy( &data.front(), resource.data(), data.size() );
+    }
+
+    hasAnyData = true;
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "SLOB: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
+               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+    // Resource not loaded -- we don't set the hasAnyData flag then
+  }
+
+  finish();
+}
+
+sptr< Dictionary::DataRequest > SlobDictionary::getResource( string const & name )
+  throw( std::exception )
+{
+  return new SlobResourceRequest( *this, name );
+}
+
+
+vector< sptr< Dictionary::Class > > makeDictionaries(
+                                      vector< string > const & fileNames,
+                                      string const & indicesDir,
+                                      Dictionary::Initializing & initializing )
+  throw( std::exception )
+{
+  vector< sptr< Dictionary::Class > > dictionaries;
+
+  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
+       ++i )
+  {
+      // Skip files with the extensions different to .slob to speed up the
+      // scanning
+
+      QString firstName = QDir::fromNativeSeparators( FsEncoding::decode( i->c_str() ) );
+      if( !firstName.endsWith( ".slob") )
+        continue;
+
+      // Got the file -- check if we need to rebuid the index
+
+      vector< string > dictFiles( 1, *i );
+
+      string dictId = Dictionary::makeDictionaryId( dictFiles );
+
+      string indexFile = indicesDir + dictId;
+
+      try
+      {
+        if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
+             indexIsOldOrBad( indexFile ) )
+        {
+          SlobFile sf;
+
+          gdDebug( "Slob: Building the index for dictionary: %s\n", i->c_str() );
+
+          sf.open( firstName );
+
+          initializing.indexingDictionary( sf.getDictionaryName().toUtf8().constData() );
+
+          File::Class idx( indexFile, "wb" );
+          IdxHeader idxHeader;
+          memset( &idxHeader, 0, sizeof( idxHeader ) );
+
+          // We write a dummy header first. At the end of the process the header
+          // will be rewritten with the right values.
+
+          idx.write( idxHeader );
+
+          RefEntry refEntry;
+          quint32 entries = sf.getRefsCount();
+
+          IndexedWords indexedWords, indexedResources;
+
+          set< quint64 > articlesPos;
+          quint32 articleCount = 0, wordCount = 0;
+
+          for( quint32 i = 0; i < entries; i++ )
+          {
+            sf.getRefEntry( i, refEntry );
+
+            quint8 type = sf.getItem( refEntry, 0 );
+
+            QString contentType = sf.getContentType( type );
+
+            if( contentType.startsWith( "text/html", Qt::CaseInsensitive )
+                || contentType.startsWith( "text/plain", Qt::CaseInsensitive ) )
+            {
+              //Article
+              indexedWords.addWord( gd::toWString( refEntry.key ), i );
+
+              wordCount += 1;
+
+              quint64 pos = ( ( (quint64)refEntry.itemIndex ) << 32 ) + refEntry.binIndex;
+              if( articlesPos.find( pos ) == articlesPos.end() )
+              {
+                articleCount += 1;
+                articlesPos.insert( pos );
+              }
+            }
+            else
+            {
+              indexedResources.addSingleWord( gd::toWString( refEntry.key ), i );
+            }
+          }
+
+          // Build index
+
+          {
+            IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
+
+            idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
+            idxHeader.indexRootOffset = idxInfo.rootOffset;
+
+            indexedWords.clear(); // Release memory -- no need for this data
+          }
+
+          {
+            IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedResources, idx );
+
+            idxHeader.resourceIndexBtreeMaxElements = idxInfo.btreeMaxElements;
+            idxHeader.resourceIndexRootOffset = idxInfo.rootOffset;
+
+            indexedResources.clear(); // Release memory -- no need for this data
+          }
+
+          idxHeader.signature = Signature;
+          idxHeader.formatVersion = CurrentFormatVersion;
+
+          idxHeader.articleCount = articleCount;
+          idxHeader.wordCount = wordCount;
+
+          QPair<quint32,quint32> langs =
+              LangCoder::findIdsForFilename( QString::fromStdString( dictFiles[ 0 ] ) );
+
+          idxHeader.langFrom = langs.first;
+          idxHeader.langTo = langs.second;
+
+          idx.rewind();
+
+          idx.write( &idxHeader, sizeof( idxHeader ) );
+
+        }
+        dictionaries.push_back( new SlobDictionary( dictId,
+                                                    indexFile,
+                                                    dictFiles ) );
+      }
+      catch( std::exception & e )
+      {
+        gdWarning( "Slob dictionary initializing failed: %s, error: %s\n",
+                   i->c_str(), e.what() );
+        continue;
+      }
+      catch( ... )
+      {
+        qWarning( "Slob dictionary initializing failed\n" );
+        continue;
+      }
+  }
+  return dictionaries;
+}
+
+} // namespace Slob
+
+#endif
diff -Nru goldendict-1.5.0~git20131003/slob.hh goldendict-1.5.0~git20150923/slob.hh
--- goldendict-1.5.0~git20131003/slob.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/slob.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef __SLOB_HH_INCLUDED__
+#define __SLOB_HH_INCLUDED__
+
+#ifdef MAKE_ZIM_SUPPORT
+
+#include "dictionary.hh"
+
+/// Support for the Slob dictionaries.
+namespace Slob {
+
+using std::vector;
+using std::string;
+
+vector< sptr< Dictionary::Class > > makeDictionaries(
+                                      vector< string > const & fileNames,
+                                      string const & indicesDir,
+                                      Dictionary::Initializing & )
+  throw( std::exception );
+
+}
+
+#endif
+
+#endif // __SLOB_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20131003/sounddir.cc goldendict-1.5.0~git20150923/sounddir.cc
--- goldendict-1.5.0~git20131003/sounddir.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/sounddir.cc	2015-09-23 08:26:24.000000000 +0000
@@ -177,9 +177,39 @@
 
   multimap< wstring, uint32_t >::const_iterator i;
 
+  string displayedName;
+  vector< char > chunk;
+  char * nameBlock;
+
   result += "<table class=\"lsa_play\">";
   for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
   {
+    if( mainArticles.size() + alternateArticles.size() <= 1 )
+      displayedName = chain[ i->second ].word;
+    else
+    {
+      try
+      {
+        Mutex::Lock _( idxMutex );
+        nameBlock = chunks.getBlock( chain[ i->second ].articleOffset, chunk );
+
+        if ( nameBlock >= &chunk.front() + chunk.size() )
+        {
+          // chunks reader thinks it's okay since zero-sized records can exist,
+          // but we don't allow that.
+          throw ChunkedStorage::exAddressOutOfRange();
+        }
+
+        chunk.back() = 0; // It must end with 0 anyway, but just in case
+        displayedName = string( nameBlock );
+      }
+      catch(  ChunkedStorage::exAddressOutOfRange & )
+      {
+        // Bad address
+        continue;
+      }
+    }
+
     result += "<tr>";
 
     QUrl url;
@@ -192,12 +222,38 @@
     result += addAudioLink( ref, getId() );
 
     result += "<td><a href=" + ref + "><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" alt=\"Play\"/></a></td>";
-    result += "<td><a href=" + ref + ">" + Html::escape( chain[ i->second ].word ) + "</a></td>";
+    result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
     result += "</tr>";
   }
 
   for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
   {
+    if( mainArticles.size() + alternateArticles.size() <= 1 )
+      displayedName = chain[ i->second ].word;
+    else
+    {
+      try
+      {
+        Mutex::Lock _( idxMutex );
+        nameBlock = chunks.getBlock( chain[ i->second ].articleOffset, chunk );
+
+        if ( nameBlock >= &chunk.front() + chunk.size() )
+        {
+          // chunks reader thinks it's okay since zero-sized records can exist,
+          // but we don't allow that.
+          throw ChunkedStorage::exAddressOutOfRange();
+        }
+
+        chunk.back() = 0; // It must end with 0 anyway, but just in case
+        displayedName = string( nameBlock );
+      }
+      catch(  ChunkedStorage::exAddressOutOfRange & )
+      {
+        // Bad address
+        continue;
+      }
+    }
+
     result += "<tr>";
 
     QUrl url;
@@ -210,7 +266,7 @@
     result += addAudioLink( ref, getId() );
 
     result += "<td><a href=" + ref + "><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" alt=\"Play\"/></a></td>";
-    result += "<td><a href=" + ref + ">" + Html::escape( chain[ i->second ].word ) + "</a></td>";
+    result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
     result += "</tr>";
   }
 
@@ -358,7 +414,7 @@
       continue; // No such dir, no dictionary then
 
     vector< string > dictFiles( 1,
-      QDir::toNativeSeparators( dir.canonicalPath() ).toLocal8Bit().data() );
+      FsEncoding::encode( QDir::toNativeSeparators( dir.canonicalPath() ) ) );
 
     dictFiles.push_back( "SoundDir" ); // A mixin
 
diff -Nru goldendict-1.5.0~git20131003/sources.cc goldendict-1.5.0~git20150923/sources.cc
--- goldendict-1.5.0~git20131003/sources.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/sources.cc	2015-09-23 08:26:24.000000000 +0000
@@ -5,18 +5,19 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QStandardItemModel>
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 
 Sources::Sources( QWidget * parent, Config::Class const & cfg):
   QWidget( parent ),
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
   textToSpeechSource( NULL ),
 #endif
   itemDelegate( new QItemDelegate( this ) ),
   itemEditorFactory( new QItemEditorFactory() ),
   mediawikisModel( this, cfg.mediawikis ),
   webSitesModel( this, cfg.webSites ),
+  dictServersModel( this, cfg.dictServers ),
   programsModel( this, cfg.programs ),
   pathsModel( this, cfg.paths ),
   soundDirsModel( this, cfg.soundDirs ),
@@ -51,6 +52,15 @@
   ui.webSites->resizeColumnToContents( 2 );
   ui.webSites->resizeColumnToContents( 3 );
 
+  ui.dictServers->setTabKeyNavigation( true );
+  ui.dictServers->setModel( &dictServersModel );
+  ui.dictServers->resizeColumnToContents( 0 );
+  ui.dictServers->resizeColumnToContents( 1 );
+  ui.dictServers->resizeColumnToContents( 2 );
+  ui.dictServers->resizeColumnToContents( 3 );
+  ui.dictServers->resizeColumnToContents( 4 );
+  ui.dictServers->resizeColumnToContents( 5 );
+
   ui.programs->setTabKeyNavigation( true );
   ui.programs->setModel( &programsModel );
   ui.programs->resizeColumnToContents( 0 );
@@ -95,9 +105,9 @@
   ui.forvoLanguageCodes->setText( forvo.languageCodes );
 
   // Text to speech
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
   textToSpeechSource = new TextToSpeechSource( this, cfg.voiceEngines );
-  ui.tabWidget->addTab( textToSpeechSource, tr( "Text to Speech" ) );
+  ui.tabWidget->addTab( textToSpeechSource, QIcon(":/icons/playsound_color.png"), tr( "Text to Speech" ) );
 #endif
 
   if ( Config::isPortableVersion() )
@@ -262,6 +272,30 @@
     webSitesModel.removeSite( current.row() );
 }
 
+void Sources::on_addDictServer_clicked()
+{
+  dictServersModel.addNewServer();
+
+  QModelIndex result =
+    dictServersModel.index( dictServersModel.rowCount( QModelIndex() ) - 1,
+                            1, QModelIndex() );
+
+  ui.dictServers->scrollTo( result );
+  ui.dictServers->edit( result );
+}
+
+void Sources::on_removeDictServer_clicked()
+{
+  QModelIndex current = ui.dictServers->currentIndex();
+
+  if ( current.isValid() &&
+       QMessageBox::question( this, tr( "Confirm removal" ),
+                              tr( "Remove site <b>%1</b> from the list?" ).arg( dictServersModel.getCurrentDictServers()[ current.row() ].name ),
+                              QMessageBox::Ok,
+                              QMessageBox::Cancel ) == QMessageBox::Ok )
+    dictServersModel.removeServer( current.row() );
+}
+
 void Sources::on_addProgram_clicked()
 {
   programsModel.addNewProgram();
@@ -288,7 +322,7 @@
 
 Config::VoiceEngines Sources::getVoiceEngines() const
 {
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
   if ( !textToSpeechSource )
     return Config::VoiceEngines();
   return textToSpeechSource->getVoiceEnginesModel().getCurrentVoiceEngines();
@@ -649,6 +683,181 @@
   return false;
 }
 
+////////// DictServersModel
+
+DictServersModel::DictServersModel( QWidget * parent,
+                              Config::DictServers const & dictServers_ ):
+  QAbstractItemModel( parent ), dictServers( dictServers_ )
+{
+}
+void DictServersModel::removeServer( int index )
+{
+  beginRemoveRows( QModelIndex(), index, index );
+  dictServers.erase( dictServers.begin() + index );
+  endRemoveRows();
+}
+
+void DictServersModel::addNewServer()
+{
+  Config::DictServer d;
+
+  d.enabled = false;
+
+  d.id = Dictionary::generateRandomDictionaryId();
+
+  d.url = "dict://";
+
+  beginInsertRows( QModelIndex(), dictServers.size(), dictServers.size() );
+  dictServers.push_back( d );
+  endInsertRows();
+}
+
+QModelIndex DictServersModel::index( int row, int column, QModelIndex const & /*parent*/ ) const
+{
+  return createIndex( row, column, 0 );
+}
+
+QModelIndex DictServersModel::parent( QModelIndex const & /*parent*/ ) const
+{
+  return QModelIndex();
+}
+
+Qt::ItemFlags DictServersModel::flags( QModelIndex const & index ) const
+{
+  Qt::ItemFlags result = QAbstractItemModel::flags( index );
+
+  if ( index.isValid() )
+  {
+    if ( !index.column() )
+      result |= Qt::ItemIsUserCheckable;
+    else
+      result |= Qt::ItemIsEditable;
+  }
+
+  return result;
+}
+
+int DictServersModel::rowCount( QModelIndex const & parent ) const
+{
+  if ( parent.isValid() )
+    return 0;
+  else
+    return dictServers.size();
+}
+
+int DictServersModel::columnCount( QModelIndex const & parent ) const
+{
+  if ( parent.isValid() )
+    return 0;
+  else
+    return 6;
+}
+
+QVariant DictServersModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
+{
+  if ( role == Qt::DisplayRole )
+    switch( section )
+    {
+      case 0:
+        return tr( "Enabled" );
+      case 1:
+        return tr( "Name" );
+      case 2:
+        return tr( "Address" );
+      case 3:
+        return tr( "Databases" );
+      case 4:
+        return tr( "Strategies" );
+      case 5:
+        return tr( "Icon" );
+      default:
+        return QVariant();
+    }
+
+  return QVariant();
+}
+
+QVariant DictServersModel::data( QModelIndex const & index, int role ) const
+{
+  if ( index.row() >= dictServers.size() )
+    return QVariant();
+
+  if ( role == Qt::DisplayRole || role == Qt::EditRole )
+  {
+    switch( index.column() )
+    {
+      case 1:
+        return dictServers[ index.row() ].name;
+      case 2:
+        return dictServers[ index.row() ].url;
+      case 3:
+        return dictServers[ index.row() ].databases;
+      case 4:
+        return dictServers[ index.row() ].strategies;
+      case 5:
+        return dictServers[ index.row() ].iconFilename;
+      default:
+        return QVariant();
+    }
+  }
+
+  if( role == Qt::ToolTipRole && index.column() == 3 )
+    return tr( "Comma-delimited list of databases\n(empty string or \"*\" matches all databases)" );
+
+  if( role == Qt::ToolTipRole && index.column() == 4 )
+    return tr( "Comma-delimited list of search strategies\n(empty string mean \"prefix\" strategy)" );
+
+  if ( role == Qt::CheckStateRole && !index.column() )
+    return dictServers[ index.row() ].enabled ? Qt::Checked : Qt::Unchecked;
+
+  return QVariant();
+}
+
+bool DictServersModel::setData( QModelIndex const & index, const QVariant & value,
+                               int role )
+{
+  if ( index.row() >= dictServers.size() )
+    return false;
+
+  if ( role == Qt::CheckStateRole && !index.column() )
+  {
+    // XXX it seems to be always passing Int( 2 ) as a value, so we just toggle
+    dictServers[ index.row() ].enabled = !dictServers[ index.row() ].enabled;
+
+    dataChanged( index, index );
+    return true;
+  }
+
+  if ( role == Qt::DisplayRole || role == Qt::EditRole )
+    switch( index.column() )
+    {
+      case 1:
+        dictServers[ index.row() ].name =  value.toString();
+        dataChanged( index, index );
+        return true;
+      case 2:
+        dictServers[ index.row() ].url =  value.toString();
+        dataChanged( index, index );
+        return true;
+      case 3:
+        dictServers[ index.row() ].databases =  value.toString();
+        dataChanged( index, index );
+        return true;
+      case 4:
+        dictServers[ index.row() ].strategies =  value.toString();
+        dataChanged( index, index );
+        return true;
+      case 5:
+        dictServers[ index.row() ].iconFilename =  value.toString();
+        dataChanged( index, index );
+        return true;
+      default:
+        return false;
+    }
+
+  return false;
+}
+
 
 ////////// ProgramsModel
 
@@ -1194,4 +1403,3 @@
 {
   emit rescan();
 }
-
diff -Nru goldendict-1.5.0~git20131003/sources.hh goldendict-1.5.0~git20150923/sources.hh
--- goldendict-1.5.0~git20131003/sources.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/sources.hh	2015-09-23 08:26:24.000000000 +0000
@@ -12,7 +12,7 @@
 #include <QItemDelegate>
 #include <QItemEditorFactory>
 
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
 #include "texttospeechsource.hh"
 #endif
 
@@ -76,6 +76,36 @@
   Config::WebSites webSites;
 };
 
+/// A model to be projected into the dictServers view, according to Qt's MVC model
+class DictServersModel: public QAbstractItemModel
+{
+  Q_OBJECT
+
+public:
+
+  DictServersModel( QWidget * parent, Config::DictServers const & );
+
+  void removeServer( int index );
+  void addNewServer();
+
+  /// Returns the sites the model currently has listed
+  Config::DictServers const & getCurrentDictServers() const
+  { return dictServers; }
+
+  QModelIndex index( int row, int column, QModelIndex const & parent ) const;
+  QModelIndex parent( QModelIndex const & parent ) const;
+  Qt::ItemFlags flags( QModelIndex const & index ) const;
+  int rowCount( QModelIndex const & parent ) const;
+  int columnCount( QModelIndex const & parent ) const;
+  QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
+  QVariant data( QModelIndex const & index, int role ) const;
+  bool setData( QModelIndex const & index, const QVariant & value, int role );
+
+private:
+
+  Config::DictServers dictServers;
+};
+
 /// A model to be projected into the programs view, according to Qt's MVC model
 class ProgramsModel: public QAbstractItemModel
 {
@@ -232,6 +262,9 @@
   Config::WebSites const & getWebSites() const
   { return webSitesModel.getCurrentWebSites(); }
 
+  Config::DictServers const & getDictServers() const
+  { return dictServersModel.getCurrentDictServers(); }
+
   Config::Programs const & getPrograms() const
   { return programsModel.getCurrentPrograms(); }
 
@@ -251,7 +284,7 @@
 private:
   Ui::Sources ui;
 
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MACX )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
   TextToSpeechSource *textToSpeechSource;
 #endif
 
@@ -260,6 +293,7 @@
 
   MediaWikisModel mediawikisModel;
   WebSitesModel webSitesModel;
+  DictServersModel dictServersModel;
   ProgramsModel programsModel;
   PathsModel pathsModel;
   SoundDirsModel soundDirsModel;
@@ -285,6 +319,9 @@
   void on_addWebSite_clicked();
   void on_removeWebSite_clicked();
 
+  void on_removeDictServer_clicked();
+  void on_addDictServer_clicked();
+
   void on_addProgram_clicked();
   void on_removeProgram_clicked();
 
diff -Nru goldendict-1.5.0~git20131003/sources.ui goldendict-1.5.0~git20150923/sources.ui
--- goldendict-1.5.0~git20131003/sources.ui	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/sources.ui	2015-09-23 08:26:24.000000000 +0000
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>690</width>
+    <width>811</width>
     <height>336</height>
    </rect>
   </property>
@@ -338,6 +338,62 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="dictdTab">
+      <attribute name="icon">
+       <iconset resource="resources.qrc">
+        <normaloff>:/icons/network.png</normaloff>:/icons/network.png</iconset>
+      </attribute>
+      <attribute name="title">
+       <string>DICT servers</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_16">
+       <item>
+        <widget class="QLabel" name="label_116">
+         <property name="text">
+          <string>DICT servers:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_16">
+         <item>
+          <widget class="QTreeView" name="dictServers"/>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_17">
+           <item>
+            <widget class="QPushButton" name="addDictServer">
+             <property name="text">
+              <string>&amp;Add...</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="removeDictServer">
+             <property name="text">
+              <string>&amp;Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer_18">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_6">
       <attribute name="icon">
        <iconset resource="resources.qrc">
diff -Nru goldendict-1.5.0~git20131003/speechhlp.cc goldendict-1.5.0~git20150923/speechhlp.cc
--- goldendict-1.5.0~git20131003/speechhlp.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/speechhlp.cc	2015-09-23 08:26:24.000000000 +0000
@@ -81,7 +81,7 @@
 void speechEnumerateAvailableEngines(EnumerateCallback callback, void *userData)
 {
     HRESULT hr;
-    IEnumSpObjectTokens * enumSpTokens;
+    IEnumSpObjectTokens * enumSpTokens = NULL;
     ULONG count = 0;
     bool next = true;
     hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
diff -Nru goldendict-1.5.0~git20131003/sphelper.hh goldendict-1.5.0~git20150923/sphelper.hh
--- goldendict-1.5.0~git20131003/sphelper.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/sphelper.hh	2015-09-23 08:26:24.000000000 +0000
@@ -20,7 +20,7 @@
 #ifdef _SAPI_VER
 #undef _SAPI_VER
 #endif
-#define _SAPI_VER 0503
+#define _SAPI_VER 0x053
 
 inline void SpHexFromUlong(WCHAR * psz, ULONG ul)
 {
@@ -110,6 +110,12 @@
     WCHAR szLangId[10];
     HRESULT hr = S_OK;
 
+    if (ppszDescription == NULL)
+    {
+        return E_POINTER;
+    }
+    *ppszDescription = NULL;
+
 #if _SAPI_VER >= 0x053
     WCHAR* pRegKeyPath = 0;
     WCHAR* pszTemp = 0;
@@ -120,12 +126,6 @@
     OSVERSIONINFO ver;
     ver.dwOSVersionInfoSize = sizeof( ver );
 
-    if (ppszDescription == NULL)
-    {
-        return E_POINTER;
-    }
-    *ppszDescription = NULL;
-
     if( ( ::GetVersionEx( &ver ) == TRUE ) && ( ver.dwMajorVersion >= 6 ) )
     {
         // If we reach this code we are running under Windows Vista
diff -Nru goldendict-1.5.0~git20131003/stardict.cc goldendict-1.5.0~git20150923/stardict.cc
--- goldendict-1.5.0~git20131003/stardict.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/stardict.cc	2015-09-23 08:26:24.000000000 +0000
@@ -10,10 +10,13 @@
 #include "xdxf2html.hh"
 #include "htmlescape.hh"
 #include "langcoder.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "fsencoding.hh"
 #include "filetype.hh"
 #include "indexedzip.hh"
+#include "tiff.hh"
+#include "ftshelpers.hh"
+#include "wstring_qt.hh"
 
 #include <zlib.h>
 #include <map>
@@ -35,6 +38,8 @@
 #include <QThreadPool>
 #include <QAtomicInt>
 #include <QDebug>
+#include <QRegExp>
+#include <QStringList>
 
 #include "ufile.hh"
 
@@ -65,6 +70,7 @@
 DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
 DEF_EX_STR( exWordIsTooLarge, "Enountered a word that is too large:", Dictionary::Ex )
 DEF_EX_STR( exSuddenEndOfFile, "Sudden end of file", Dictionary::Ex )
+DEF_EX_STR( exDictzipError, "DICTZIP error", Dictionary::Ex )
 
 DEF_EX_STR( exIncorrectOffset, "Incorrect offset encountered in file", Dictionary::Ex )
 
@@ -173,6 +179,20 @@
 
   virtual QString getMainFilename();
 
+  virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                            int searchMode, bool matchCase,
+                                                            int distanceBetweenWords,
+                                                            int maxResults );
+  virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+  virtual void setFTSParameters( Config::FullTextSearch const & fts )
+  {
+    can_FTS = fts.enabled
+              && !fts.disabledTypes.contains( "STARDICT", Qt::CaseInsensitive )
+              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
 protected:
 
   void loadIcon() throw();
@@ -194,6 +214,8 @@
 
   string handleResource( char type, char const * resource, size_t size );
 
+  void pangoToHtml( QString & text );
+
   friend class StardictResourceRequest;
   friend class StardictArticleRequest;
   friend class StardictHeadwordsRequest;
@@ -211,10 +233,12 @@
 {
   // Open the .dict file
 
-  dz = dict_data_open( dictionaryFiles[ 2 ].c_str(), 0 );
+  DZ_ERRORS error;
+  dz = dict_data_open( dictionaryFiles[ 2 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exCantReadFile( dictionaryFiles[ 2 ] );
+    throw exDictzipError( string( dz_error_str( error ) )
+                          + "(" + dictionaryFiles[ 2 ] + ")" );
 
   // Initialize the index
 
@@ -238,6 +262,16 @@
     if ( zipName.endsWith( ".zip", Qt::CaseInsensitive ) ) // Sanity check
       resourceZip.openZipFile( zipName );
   }
+
+  // Full-text search parameters
+
+  can_FTS = true;
+
+  ftsIdxName = indexFile + "_FTS";
+
+  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+    FTS_index_completed.ref();
 }
 
 StardictDictionary::~StardictDictionary()
@@ -297,10 +331,11 @@
 /// 'type', contained in a block pointed to by 'resource', 'size' bytes long.
 string StardictDictionary::handleResource( char type, char const * resource, size_t size )
 {
+  QString text;
   switch( type )
   {
     case 'x': // Xdxf content
-      return Xdxf2Html::convert( string( resource, size ), Xdxf2Html::STARDICT, NULL, this );
+      return Xdxf2Html::convert( string( resource, size ), Xdxf2Html::STARDICT, NULL, this, &resourceZip );
     case 'h': // Html content
     {
       string articleText = "<div class=\"sdct_h\">" + string( resource, size ) + "</div>";
@@ -322,7 +357,9 @@
                                                          isToLanguageRTL() )
                                       + "</div>";
     case 'g': // Pango markup.
-      return "<div class=\"sdct_g\">" + string( resource, size ) + "</div>";
+      text = QString::fromUtf8( resource, size );
+      pangoToHtml( text );
+      return "<div class=\"sdct_g\">" + string( text.toUtf8().data() ) + "</div>";
     case 't': // Transcription
       return "<div class=\"sdct_t\">" + Html::escape( string( resource, size ) ) + "</div>";
     case 'y': // Chinese YinBiao or Japanese KANA. Examples are needed. For now,
@@ -352,6 +389,303 @@
     return string( "<b>Unknown blob entry type " ) + string( 1, type ) + "</b><br>";
 }
 
+void StardictDictionary::pangoToHtml( QString & text )
+{
+/*
+ * Partially support for Pango Markup Language
+ * Attributes "fallback", "lang", "gravity", "gravity_hint" just ignored
+ */
+
+  QRegExp spanRegex( "<span\\s*([^>]*)>", Qt::CaseInsensitive );
+  QRegExp styleRegex( "(\\w+)=\"([^\"]*)\"" );
+
+  text.replace( "\n", "<br>" );
+
+  int pos = 0;
+  do
+  {
+    pos = spanRegex.indexIn( text, pos );
+    if( pos >= 0 )
+    {
+      QString styles = spanRegex.cap( 1 );
+      QString newSpan( "<span style=\"" );
+      int stylePos = 0;
+      do
+      {
+        stylePos = styleRegex.indexIn( styles, stylePos );
+        QString style = styleRegex.cap( 1 );
+        if( stylePos >= 0 )
+        {
+          if( style.compare( "font_desc", Qt::CaseInsensitive ) == 0
+              || style.compare( "font", Qt::CaseInsensitive ) == 0 )
+          {
+            // Parse font description
+
+            QStringList list = styleRegex.cap( 2 ).split( " ", QString::SkipEmptyParts );
+            int n;
+            QString sizeStr, stylesStr, familiesStr;
+            for( n = list.size() - 1; n >= 0; n-- )
+            {
+              QString str = list.at( n );
+
+              // font size
+              if( str[ 0 ].isNumber() )
+              {
+                sizeStr = QString( "font-size:" ) + str + ";";
+                continue;
+              }
+
+              // font style
+              if( str.compare( "normal", Qt::CaseInsensitive ) == 0
+                  || str.compare( "oblique", Qt::CaseInsensitive ) == 0
+                  || str.compare( "italic", Qt::CaseInsensitive ) == 0 )
+              {
+                if( !stylesStr.contains( "font-style:" ) )
+                  stylesStr += QString( "font-style:" ) + str + ";";
+                continue;
+              }
+
+              // font variant
+              if( str.compare( "smallcaps", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-variant:small-caps" ) ;
+                continue;
+              }
+
+              // font weight
+              if( str.compare( "ultralight", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-weight:100;" );
+                continue;
+              }
+              if( str.compare( "light", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-weight:200;" );
+                continue;
+              }
+              if( str.compare( "bold", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-weight:bold;" );
+                continue;
+              }
+              if( str.compare( "ultrabold", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-weight:800;" );
+                continue;
+              }
+              if( str.compare( "heavy", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-weight:900" );
+                continue;
+              }
+
+              // font stretch
+              if( str.compare( "ultracondensed", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:ultra-condensed;" );
+                continue;
+              }
+              if( str.compare( "extracondensed", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:extra-condensed;" );
+                continue;
+              }
+              if( str.compare( "semicondensed", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:semi-condensed;" );
+                continue;
+              }
+              if( str.compare( "semiexpanded", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:semi-expanded;" );
+                continue;
+              }
+              if( str.compare( "extraexpanded", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:extra-expanded;" );
+                continue;
+              }
+              if( str.compare( "ultraexpanded", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:ultra-expanded;" );
+                continue;
+              }
+              if( str.compare( "condensed", Qt::CaseInsensitive ) == 0
+                  || str.compare( "expanded", Qt::CaseInsensitive ) == 0 )
+              {
+                stylesStr += QString( "font-stretch:" ) + str + ";";
+                continue;
+              }
+
+              // gravity
+              if( str.compare( "south", Qt::CaseInsensitive ) == 0
+                  || str.compare( "east", Qt::CaseInsensitive ) == 0
+                  || str.compare( "north", Qt::CaseInsensitive ) == 0
+                  || str.compare( "west", Qt::CaseInsensitive ) == 0
+                  || str.compare( "auto", Qt::CaseInsensitive ) == 0 )
+              {
+                continue;
+              }
+              break;
+            }
+
+            // last words is families list
+            if( n >= 0 )
+            {
+              familiesStr = QString( "font-family:" );
+              for( int i = 0; i <= n; i++ )
+              {
+                if( i > 0 && !familiesStr.endsWith( ',' ) )
+                  familiesStr += ",";
+                familiesStr += list.at( i );
+              }
+              familiesStr += ";";
+            }
+
+            newSpan += familiesStr + stylesStr + sizeStr;
+          }
+          else if( style.compare( "font_family", Qt::CaseInsensitive ) == 0
+                   || style.compare( "face", Qt::CaseInsensitive ) == 0 )
+            newSpan += QString( "font-family:" ) + styleRegex.cap( 2 ) + ";";
+          else if( style.compare( "font_size", Qt::CaseInsensitive ) == 0
+                   || style.compare( "size", Qt::CaseInsensitive ) == 0 )
+          {
+            if( styleRegex.cap( 2 )[ 0 ].isLetter()
+                || styleRegex.cap( 2 ).endsWith( "px", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "pt", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "em", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "%" ) )
+              newSpan += QString( "font-size:" ) + styleRegex.cap( 2 ) +";";
+            else
+            {
+              int size = styleRegex.cap( 2 ).toInt();
+              if( size )
+                newSpan += QString( "font-size:%1pt;" ).arg( size / 1024.0, 0, 'f', 3 );
+            }
+          }
+          else if( style.compare( "font_style", Qt::CaseInsensitive ) == 0
+                   || style.compare( "style", Qt::CaseInsensitive ) == 0)
+            newSpan += QString( "font-style:" ) + styleRegex.cap( 2 ) + ";";
+          else if( style.compare( "weight", Qt::CaseInsensitive ) == 0
+                   || style.compare( "weight", Qt::CaseInsensitive ) == 0)
+          {
+            QString str = styleRegex.cap( 2 );
+            if( str.compare( "ultralight", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-weight:100;" );
+            else if( str.compare( "light", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-weight:200;" );
+            else if( str.compare( "ultrabold", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-weight:800;" );
+            else if( str.compare( "heavy", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-weight:900" );
+            else
+              newSpan += QString( "font-weight:" ) + str + ";";
+          }
+          else if( style.compare( "font_variant", Qt::CaseInsensitive ) == 0
+                   || style.compare( "variant", Qt::CaseInsensitive ) == 0 )
+          {
+            if( styleRegex.cap( 2 ).compare( "smallcaps", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-variant:small-caps" );
+            else
+              newSpan += QString( "font-variant:" ) + styleRegex.cap( 2 ) + ";";
+          }
+          else if( style.compare( "font_stretch", Qt::CaseInsensitive ) == 0
+                   || style.compare( "stretch", Qt::CaseInsensitive ) == 0 )
+          {
+            QString str = styleRegex.cap( 2 );
+            if( str.compare( "ultracondensed", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-stretch:ultra-condensed;" );
+            else if( str.compare( "extracondensed", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-stretch:extra-condensed;" );
+            else if( str.compare( "semicondensed", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-stretch:semi-condensed;" );
+            else if( str.compare( "semiexpanded", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-stretch:semi-expanded;" );
+            else if( str.compare( "extraexpanded", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-stretch:extra-expanded;" );
+            else if( str.compare( "ultraexpanded", Qt::CaseInsensitive ) == 0 )
+              newSpan += QString( "font-stretch:ultra-expanded;" );
+            else
+              newSpan += QString( "font-stretch:" ) + str + ";";
+          }
+          else if( style.compare( "foreground", Qt::CaseInsensitive ) == 0
+                   || style.compare( "fgcolor", Qt::CaseInsensitive ) == 0
+                   || style.compare( "color", Qt::CaseInsensitive ) == 0 )
+            newSpan += QString( "color:" ) + styleRegex.cap( 2 ) + ";";
+          else if( style.compare( "background", Qt::CaseInsensitive ) == 0
+                   || style.compare( "bgcolor", Qt::CaseInsensitive ) == 0 )
+            newSpan += QString( "background-color:" ) + styleRegex.cap( 2 ) + ";";
+          else if( style.compare( "underline_color", Qt::CaseInsensitive ) == 0
+                   || style.compare( "strikethrough_color", Qt::CaseInsensitive ) == 0 )
+            newSpan += QString( "text-decoration-color:" ) + styleRegex.cap( 2 ) + ";";
+          else if( style.compare( "underline", Qt::CaseInsensitive ) == 0 )
+          {
+            if( styleRegex.cap( 2 ).compare( "none", Qt::CaseInsensitive ) )
+              newSpan += QString( "text-decoration-line:none;" );
+            else
+            {
+              newSpan += QString( "text-decoration-line:underline; " );
+              if( styleRegex.cap( 2 ).compare( "low", Qt::CaseInsensitive ) )
+                newSpan += QString( "text-decoration-style:dotted;" );
+              else if( styleRegex.cap( 2 ).compare( "single", Qt::CaseInsensitive ) )
+                newSpan += QString( "text-decoration-style:solid;" );
+              else if( styleRegex.cap( 2 ).compare( "error", Qt::CaseInsensitive ) )
+                newSpan += QString( "text-decoration-style:wavy;" );
+              else
+                newSpan += QString( "text-decoration-style:" ) + styleRegex.cap( 2 ) + ";";
+            }
+          }
+          else if( style.compare( "strikethrough", Qt::CaseInsensitive ) == 0 )
+          {
+            if( styleRegex.cap( 2 ).compare( "true", Qt::CaseInsensitive ) )
+              newSpan += QString( "text-decoration-line:line-through;" );
+            else
+              newSpan += QString( "text-decoration-line:none;" );
+          }
+          else if( style.compare( "rise", Qt::CaseInsensitive ) == 0 )
+          {
+            if( styleRegex.cap( 2 ).endsWith( "px", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "pt", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "em", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "%" ) )
+              newSpan += QString( "vertical-align:" ) + styleRegex.cap( 2 ) +";";
+            else
+            {
+              int riseValue = styleRegex.cap( 2 ).toInt();
+              if( riseValue )
+                newSpan += QString( "vertical-align:%1pt;" ).arg( riseValue / 1024.0, 0, 'f', 3 );
+            }
+          }
+          else if( style.compare( "letter_spacing", Qt::CaseInsensitive ) == 0 )
+          {
+            if( styleRegex.cap( 2 ).endsWith( "px", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "pt", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "em", Qt::CaseInsensitive )
+                || styleRegex.cap( 2 ).endsWith( "%" ) )
+              newSpan += QString( "letter-spacing:" ) + styleRegex.cap( 2 ) +";";
+            else
+            {
+              int spacing = styleRegex.cap( 2 ).toInt();
+              if( spacing )
+                newSpan += QString( "letter-spacing:%1pt;" ).arg( spacing / 1024.0, 0, 'f', 3 );
+            }
+          }
+
+          stylePos += styleRegex.matchedLength();
+        }
+      }
+      while( stylePos >= 0 );
+
+      newSpan += "\">";
+      text.replace( pos, spanRegex.matchedLength(), newSpan );
+      pos += newSpan.size();
+    }
+  }
+  while( pos >= 0 );
+
+  text.replace( "  ", "&nbsp;&nbsp;" );
+}
+
 void StardictDictionary::loadArticle( uint32_t address,
                                       string & headword,
                                       string & articleText )
@@ -396,7 +730,7 @@
       else
       if ( !size )
       {
-        qWarning( "Stardict: short entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        gdWarning( "Stardict: short entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
         break;
       }
 
@@ -410,7 +744,7 @@
 
         if ( size < entrySize )
         {
-          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
           break;
         }
 
@@ -431,7 +765,7 @@
         {
           if ( size < sizeof( uint32_t ) )
           {
-            qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+            gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
             break;
           }
 
@@ -445,7 +779,7 @@
 
         if ( size < entrySize )
         {
-          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
           break;
         }
 
@@ -456,8 +790,8 @@
       }
       else
       {
-        qWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
-                  type, headword.c_str(), getName().c_str() );
+        gdWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
+                   type, headword.c_str(), getName().c_str() );
         break;
       }
     }
@@ -474,7 +808,7 @@
 
         if ( size < len + 2 )
         {
-          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
           break;
         }
 
@@ -489,7 +823,7 @@
         // An entry which havs its size before contents
         if ( size < sizeof( uint32_t ) + 1 )
         {
-          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
           break;
         }
 
@@ -501,7 +835,7 @@
 
         if ( size < sizeof( uint32_t ) + 1 + entrySize )
         {
-          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
           break;
         }
 
@@ -512,8 +846,8 @@
       }
       else
       {
-        qWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
-                  (unsigned)*ptr, headword.c_str(), getName().c_str() );
+        gdWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
+                   (unsigned)*ptr, headword.c_str(), getName().c_str() );
         break;
       }
     }
@@ -531,7 +865,10 @@
     Ifo ifo( ifoFile );
 
     if( !ifo.copyright.empty() )
-      dictionaryDescription += "Copyright: " + QString::fromUtf8( ifo.copyright.c_str() ) + "\n\n";
+      dictionaryDescription += "Copyright: "
+                               + QString::fromUtf8( ifo.copyright.c_str() )
+                                 .replace( "<br>", "\n", Qt::CaseInsensitive )
+                               + "\n\n";
 
     if( !ifo.author.empty() )
       dictionaryDescription += "Author: " + QString::fromUtf8( ifo.author.c_str() ) + "\n\n";
@@ -543,7 +880,8 @@
     {
       QString desc = QString::fromUtf8( ifo.description.c_str() );
       desc.replace( "\t", "<br/>" );
-      desc.replace( "\\n", "<br/>" );
+      desc.replace( "\\n", "\n" );
+      desc.replace( "<br>", "\n", Qt::CaseInsensitive );
       dictionaryDescription += Html::unescape( desc );
     }
 
@@ -558,6 +896,63 @@
   return FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() );
 }
 
+void StardictDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "Stardict: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Stardict: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void StardictDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    string headwordStr, articleStr;
+    loadArticle( articleAddress, headwordStr, articleStr );
+
+    headword = QString::fromUtf8( headwordStr.data(), headwordStr.size() );
+
+    wstring wstr = Utf8::decode( articleStr );
+
+    text = Html::unescape( gd::toQString( wstr ) );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Stardict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+sptr< Dictionary::DataRequest > StardictDictionary::getSearchResults( QString const & searchString,
+                                                                      int searchMode, bool matchCase,
+                                                                      int distanceBetweenWords,
+                                                                      int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 /// StardictDictionary::findHeadwordsForSynonym()
 
 class StardictHeadwordsRequest;
@@ -1049,7 +1444,7 @@
       FsEncoding::separator() +
       FsEncoding::encode( resourceName );
 
-    DPRINTF( "n is %s\n", n.c_str() );
+    GD_DPRINTF( "n is %s\n", n.c_str() );
 
     try
     {
@@ -1083,6 +1478,11 @@
       QImage img = QImage::fromData( (unsigned char *) &data.front(),
                                      data.size() );
 
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+      if( img.isNull() )
+        GdTiff::tiffToQImage( &data.front(), data.size(), img );
+#endif
+
       dataMutex.unlock();
 
       if ( !img.isNull() )
@@ -1117,7 +1517,7 @@
   }
   catch( std::exception &ex )
   {
-    qWarning( "Stardict: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
+    gdWarning( "Stardict: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
               resourceName.c_str(), dict.getName().c_str(), ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
@@ -1218,7 +1618,7 @@
                                            sizeof( uint32_t ) * 2 ) >
          &image.back() )
     {
-      FDPRINTF( stderr, "Warning: sudden end of file %s\n", fileName.c_str() );
+      GD_FDPRINTF( stderr, "Warning: sudden end of file %s\n", fileName.c_str() );
       break;
     }
 
@@ -1300,7 +1700,7 @@
     indexedWords.addWord( Utf8::decode( word ), offset );
   }
 
-  DPRINTF( "%u entires made\n", (unsigned) indexedWords.size() );
+  GD_DPRINTF( "%u entires made\n", (unsigned) indexedWords.size() );
 }
 
 
@@ -1356,7 +1756,7 @@
 
         Ifo ifo( ifoFile );
 
-        qDebug( "Stardict: Building the index for dictionary: %s\n", ifo.bookname.c_str() );
+        gdDebug( "Stardict: Building the index for dictionary: %s\n", ifo.bookname.c_str() );
 
         if ( ifo.idxoffsetbits == 64 )
           throw ex64BitsNotSupported();
@@ -1368,21 +1768,21 @@
         {
           if ( ifo.synwordcount )
           {
-            DPRINTF( "Warning: dictionary has synwordcount specified, but no "
-                    "corresponding .syn file was found\n" );
+            GD_DPRINTF( "Warning: dictionary has synwordcount specified, but no "
+                        "corresponding .syn file was found\n" );
             ifo.synwordcount = 0;  // Pretend it wasn't there
           }
         }
         else
         if ( !ifo.synwordcount )
         {
-          DPRINTF( "Warning: ignoring .syn file %s, since there's no synwordcount in .ifo specified\n",
-                  synFileName.c_str() );
+          GD_DPRINTF( "Warning: ignoring .syn file %s, since there's no synwordcount in .ifo specified\n",
+                      synFileName.c_str() );
         }
 
 
-        DPRINTF( "bookname = %s\n", ifo.bookname.c_str() );
-        DPRINTF( "wordcount = %u\n", ifo.wordcount );
+        GD_DPRINTF( "bookname = %s\n", ifo.bookname.c_str() );
+        GD_DPRINTF( "wordcount = %u\n", ifo.wordcount );
 
         initializing.indexingDictionary( ifo.bookname );
 
@@ -1459,7 +1859,7 @@
 
         if ( zipFileName.size() )
         {
-          DPRINTF( "Indexing zip file\n" );
+          GD_DPRINTF( "Indexing zip file\n" );
 
           idxHeader.hasZipFile = 1;
 
@@ -1502,8 +1902,8 @@
     }
     catch( std::exception & e )
     {
-      FDPRINTF( stderr, "Stardict's dictionary reading failed: %s, error: %s\n",
-        i->c_str(), e.what() );
+      gdWarning( "Stardict dictionary initializing failed: %s, error: %s\n",
+                 i->c_str(), e.what() );
     }
   }
 
diff -Nru goldendict-1.5.0~git20131003/tiff.cc goldendict-1.5.0~git20150923/tiff.cc
--- goldendict-1.5.0~git20131003/tiff.cc	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/tiff.cc	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,144 @@
+/* This file is (c) 2014 Abs62
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+
+#include "tiff.hh"
+
+#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
+#include "tiff/tiff.h"
+#include "tiff/tiffio.h"
+#else
+#include "tiff.h"
+#include "tiffio.h"
+#endif
+
+#include <QBuffer>
+
+namespace GdTiff
+{
+
+tsize_t tiffReadProc( thandle_t fd, tdata_t buf, tsize_t size )
+{
+  return static_cast< QIODevice * >( fd )->read( static_cast< char * >( buf ), size );
+}
+
+tsize_t tiffWriteProc( thandle_t fd, tdata_t buf, tsize_t size )
+{
+Q_UNUSED( fd )
+Q_UNUSED( buf )
+Q_UNUSED( size )
+  return 0;
+}
+
+toff_t tiffSeekProc( thandle_t fd, toff_t off, int whence )
+{
+  QIODevice * device = static_cast< QIODevice * >( fd );
+  switch (whence) {
+    case SEEK_SET:
+        device->seek( off );
+        break;
+    case SEEK_CUR:
+        device->seek( device->pos() + off );
+        break;
+    case SEEK_END:
+        device->seek( device->size() + off );
+        break;
+  }
+
+  return device->pos();
+}
+
+int tiffCloseProc( thandle_t fd )
+{
+Q_UNUSED( fd )
+  return 0;
+}
+
+toff_t tiffSizeProc( thandle_t fd )
+{
+  return static_cast< QIODevice * >( fd )->size();
+}
+
+int tiffMapProc( thandle_t fd, tdata_t * pbase, toff_t * psize )
+{
+Q_UNUSED( fd )
+Q_UNUSED( pbase )
+Q_UNUSED( psize )
+  return 0;
+}
+
+void tiffUnmapProc( thandle_t fd, tdata_t base, toff_t size )
+{
+Q_UNUSED( fd )
+Q_UNUSED( base )
+Q_UNUSED( size )
+}
+
+
+bool tiffToQImage( const char * data, int size, QImage & image )
+{
+  QByteArray arr = QByteArray::fromRawData( data, size );
+  QBuffer buf;
+  buf.setData( arr );
+  buf.open( QIODevice::ReadOnly );
+
+  TIFF *const tiff = TIFFClientOpen( "foo",
+                                     "r",
+                                     &buf,
+                                     tiffReadProc,
+                                     tiffWriteProc,
+                                     tiffSeekProc,
+                                     tiffCloseProc,
+                                     tiffSizeProc,
+                                     tiffMapProc,
+                                     tiffUnmapProc );
+  if( !tiff )
+    return false;
+
+  uint32 width, height;
+  if( !TIFFGetField( tiff, TIFFTAG_IMAGEWIDTH, &width )
+      || !TIFFGetField( tiff, TIFFTAG_IMAGELENGTH, &height ) )
+  {
+    TIFFClose( tiff );
+    return false;
+  }
+
+  uint16 bitPerSample;
+  if( !TIFFGetField( tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample ) )
+    bitPerSample = 1;
+
+  uint16 samplesPerPixel; // they may be e.g. grayscale with 2 samples per pixel
+  if( !TIFFGetField( tiff, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel ) )
+    samplesPerPixel = 1;
+
+  if( bitPerSample == 1 && samplesPerPixel == 1 )
+  {
+    QImage tiffImage( width, height, QImage::Format_Mono );
+
+    QVector<QRgb> colortable( 2 );
+    colortable[0] = 0xffffffff;
+    colortable[1] = 0xff000000;
+    tiffImage.setColorTable( colortable );
+
+    for ( uint32 y = 0; y < height; ++y )
+    {
+      if( TIFFReadScanline( tiff, tiffImage.scanLine( y ), y, 0 ) < 0 )
+      {
+        TIFFClose( tiff );
+        return false;
+      }
+    }
+
+    image = tiffImage;
+    TIFFClose( tiff );
+    return true;
+  }
+
+  TIFFClose( tiff );
+  return false;
+}
+
+} // namespace
+
+#endif
diff -Nru goldendict-1.5.0~git20131003/tiff.hh goldendict-1.5.0~git20150923/tiff.hh
--- goldendict-1.5.0~git20131003/tiff.hh	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/tiff.hh	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,20 @@
+#ifndef __TIFF_HH_INCLUDED__
+#define __TIFF_HH_INCLUDED__
+
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+
+#include <QImage>
+
+namespace GdTiff
+{
+
+// QImage don't handle TIFF files if TIFFTAG_PHOTOMETRIC is not set
+// We will handle such 1-bit b/w images with default photometric
+
+bool tiffToQImage( const char * data, int size, QImage & image );
+
+}
+
+#endif
+
+#endif // TIFF_HH
diff -Nru goldendict-1.5.0~git20131003/transliteration.cc goldendict-1.5.0~git20150923/transliteration.cc
--- goldendict-1.5.0~git20131003/transliteration.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/transliteration.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,7 +4,7 @@
 #include "transliteration.hh"
 #include "utf8.hh"
 #include "folding.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 namespace Transliteration {
 
@@ -122,7 +122,7 @@
 
   vector< wstring > alts = getAlternateWritings( str );
 
-  DPRINTF( "alts = %u\n", (unsigned) alts.size() );
+  GD_DPRINTF( "alts = %u\n", (unsigned) alts.size() );
   
   for( unsigned x = 0; x < alts.size(); ++x )
     result->getMatches().push_back( alts[ x ] );
diff -Nru goldendict-1.5.0~git20131003/webmultimediadownload.cc goldendict-1.5.0~git20150923/webmultimediadownload.cc
--- goldendict-1.5.0~git20131003/webmultimediadownload.cc	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/webmultimediadownload.cc	2015-09-23 08:26:24.000000000 +0000
@@ -49,7 +49,7 @@
 {
   // Note: we check for forvo sound links explicitly, as they don't have extensions
 
-  return url.scheme() == "http" && (
+  return ( url.scheme() == "http" || url.scheme() == "https" ) && (
       Filetype::isNameOfSound( url.path().toUtf8().data() ) || url.host() == "apifree.forvo.com" );
 }
 
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/appendix.h goldendict-1.5.0~git20150923/winlibs/include/eb/appendix.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/appendix.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/appendix.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,100 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_APPENDIX_H
+#define EB_APPENDIX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "eb.h"
+#else
+#include <eb/eb.h>
+#endif
+
+/*
+ * Function declarations.
+ */
+/* appendix.c */
+void eb_initialize_appendix(EB_Appendix *appendix);
+void eb_finalize_appendix(EB_Appendix *appendix);
+EB_Error_Code eb_bind_appendix(EB_Appendix *appendix, const char *path);
+int eb_is_appendix_bound(EB_Appendix *appendix);
+EB_Error_Code eb_appendix_path(EB_Appendix *appendix, char *path);
+
+/* appsub.c */
+EB_Error_Code eb_load_all_appendix_subbooks(EB_Appendix *appendix);
+EB_Error_Code eb_appendix_subbook_list(EB_Appendix *appendix,
+    EB_Subbook_Code *subbook_list, int *subbook_count);
+EB_Error_Code eb_appendix_subbook(EB_Appendix *appendix,
+    EB_Subbook_Code *subbook_code);
+EB_Error_Code eb_appendix_subbook_directory(EB_Appendix *appendix,
+    char *directory);
+EB_Error_Code eb_appendix_subbook_directory2(EB_Appendix *appendix,
+    EB_Subbook_Code subbook_code, char *directory);
+EB_Error_Code eb_set_appendix_subbook(EB_Appendix *appendix,
+    EB_Subbook_Code subbook_code);
+void eb_unset_appendix_subbook(EB_Appendix *appendix);
+
+/* narwalt.c */
+int eb_have_narrow_alt(EB_Appendix *appendix);
+EB_Error_Code eb_narrow_alt_start(EB_Appendix *appendix, int *start);
+EB_Error_Code eb_narrow_alt_end(EB_Appendix *appendix, int *end);
+EB_Error_Code eb_narrow_alt_character_text(EB_Appendix *appendix,
+    int character_number, char *text);
+EB_Error_Code eb_forward_narrow_alt_character(EB_Appendix *appendix,
+    int n, int *character_number);
+EB_Error_Code eb_backward_narrow_alt_character(EB_Appendix *appendix,
+    int n, int *character_number);
+
+/* stopcode.c */
+int eb_have_stop_code(EB_Appendix *appendix);
+EB_Error_Code eb_stop_code(EB_Appendix *appendix, int *);
+
+/* widealt.c */
+int eb_have_wide_alt(EB_Appendix *appendix);
+EB_Error_Code eb_wide_alt_start(EB_Appendix *appendix, int *start);
+EB_Error_Code eb_wide_alt_end(EB_Appendix *appendix, int *end);
+EB_Error_Code eb_wide_alt_character_text(EB_Appendix *appendix,
+    int character_number, char *text);
+EB_Error_Code eb_forward_wide_alt_character(EB_Appendix *appendix, int n,
+    int *character_number);
+EB_Error_Code eb_backward_wide_alt_character(EB_Appendix *appendix, int n,
+    int *character_number);
+
+/* for backward compatibility */
+#define eb_suspend_appendix eb_unset_appendix_subbook
+#define eb_initialize_all_appendix_subbooks eb_load_all_appendix_subbooks
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_APPENDIX_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/binary.h goldendict-1.5.0~git20150923/winlibs/include/eb/binary.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/binary.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/binary.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,73 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 2001-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_BINARY_H
+#define EB_BINARY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Function declarations.
+ */
+/* binary.c */
+EB_Error_Code eb_set_binary_mono_graphic(EB_Book *book,
+    const EB_Position *position, int width, int height);
+EB_Error_Code eb_set_binary_gray_graphic(EB_Book *book,
+    const EB_Position *position, int width, int height);
+EB_Error_Code eb_set_binary_wave(EB_Book *book,
+    const EB_Position *start_position, const EB_Position *end_position);
+EB_Error_Code eb_set_binary_color_graphic(EB_Book *book,
+    const EB_Position *position);
+EB_Error_Code eb_set_binary_mpeg(EB_Book *book, const unsigned int *argv);
+EB_Error_Code eb_read_binary(EB_Book *book, size_t binary_max_length,
+    char *binary, ssize_t *binary_length);
+void eb_unset_binary(EB_Book *book);
+
+/* filename.c */
+EB_Error_Code eb_compose_movie_file_name(const unsigned int *argv,
+    char *composed_file_name);
+EB_Error_Code eb_compose_movie_path_name(EB_Book *book,
+    const unsigned int *argv, char *composed_path_name);
+EB_Error_Code eb_decompose_movie_file_name(unsigned int *argv,
+    const char *composed_file_name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_BINARY_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/booklist.h goldendict-1.5.0~git20150923/winlibs/include/eb/booklist.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/booklist.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/booklist.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,60 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_BOOKLIST_H
+#define EB_BOOKLIST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "eb.h"
+#else
+#include <eb/eb.h>
+#endif
+
+/*
+ * Function declarations.
+ */
+/* booklist.c */
+void eb_initialize_booklist(EB_BookList *booklist);
+void eb_finalize_booklist(EB_BookList *booklist);
+EB_Error_Code eb_bind_booklist(EB_BookList *booklist, const char *path);
+EB_Error_Code eb_booklist_book_count(EB_BookList *booklist, int *book_count);
+EB_Error_Code eb_booklist_book_name(EB_BookList *booklist, int book_index,
+    char **book_name);
+EB_Error_Code eb_booklist_book_title(EB_BookList *booklist, int book_index,
+    char **book_title);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_BOOKLIST_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/defs.h goldendict-1.5.0~git20150923/winlibs/include/eb/defs.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/defs.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/defs.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,1040 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_DEFS_H
+#define EB_DEFS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+#include <limits.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "sysdefs.h"
+#include "zio.h"
+#else
+#include <eb/sysdefs.h>
+#include <eb/zio.h>
+#endif
+
+#ifdef EB_ENABLE_PTHREAD
+#include <pthread.h>
+#endif
+
+/*
+ * Disc code
+ */
+#define EB_DISC_EB			0
+#define EB_DISC_EPWING			1
+#define EB_DISC_INVALID			-1
+
+/*
+ * Character codes.
+ */
+#define EB_CHARCODE_ISO8859_1		1
+#define EB_CHARCODE_JISX0208		2
+#define EB_CHARCODE_JISX0208_GB2312	3
+#define EB_CHARCODE_INVALID		-1
+
+/*
+ * Special book ID for cache to represent "no cache data for any book".
+ */
+#define EB_BOOK_NONE			-1
+
+/*
+ * Special disc code, subbook code, multi search ID, and multi search
+ * entry ID, for representing error state.
+ */
+#define EB_SUBBOOK_INVALID		-1
+#define EB_MULTI_INVALID		-1
+
+/*
+ * Size of a page (The term `page' means `block' in JIS X 4081).
+ */
+#define EB_SIZE_PAGE			2048
+
+/*
+ * Maximum length of a word to be searched.
+ */
+#define EB_MAX_WORD_LENGTH             255
+
+/*
+ * Maximum length of an EB* book title.
+ */
+#define EB_MAX_EB_TITLE_LENGTH		30
+
+/*
+ * Maximum length of an EPWING book title.
+ */
+#define EB_MAX_EPWING_TITLE_LENGTH	80
+
+/*
+ * Maximum length of a book title.
+ */
+#define EB_MAX_TITLE_LENGTH		80
+
+/*
+ * Maximum length of a word to be searched.
+ */
+#if defined(PATH_MAX)
+#define EB_MAX_PATH_LENGTH		PATH_MAX
+#elif defined(MAXPATHLEN)
+#define EB_MAX_PATH_LENGTH		MAXPATHLEN
+#else
+#define EB_MAX_PATH_LENGTH		1024
+#endif
+
+/*
+ * Maximum length of a directory name.
+ */
+#define EB_MAX_DIRECTORY_NAME_LENGTH	8
+
+/*
+ * Maximum length of a file name under a certain directory.
+ * prefix(8 chars) + '.' + suffix(3 chars) + ';' + digit(1 char)
+ */
+#define EB_MAX_FILE_NAME_LENGTH		14
+
+/*
+ * Maximum length of a label for multi-search entry.
+ */
+#define EB_MAX_MULTI_LABEL_LENGTH	30
+
+/*
+ * Maximum length of alternation text string for a private character.
+ */
+#define EB_MAX_ALTERNATION_TEXT_LENGTH	31
+
+/*
+ * Maximum length of title for multi search.
+ */
+#define EB_MAX_MULTI_TITLE_LENGTH	32
+
+/*
+ * Maximum number of font heights in a subbok.
+ */
+#define EB_MAX_FONTS			4
+
+/*
+ * Maximum number of subbooks in a book.
+ */
+#define EB_MAX_SUBBOOKS			50
+
+/*
+ * Maximum number of multi-search types in a subbook.
+ */
+#define EB_MAX_MULTI_SEARCHES		10
+
+/*
+ * Maximum number of entries in a multi-search.
+ */
+#define EB_MAX_MULTI_ENTRIES		5
+
+/*
+ * Maximum number of entries in a keyword search.
+ */
+#define EB_MAX_KEYWORDS			EB_MAX_MULTI_ENTRIES
+
+/*
+ * Maximum number of entries in a cross search.
+ */
+#define EB_MAX_CROSS_ENTRIES		EB_MAX_MULTI_ENTRIES
+
+/*
+ * Maximum number of characters for alternation cache.
+ */
+#define EB_MAX_ALTERNATION_CACHE	16
+
+/*
+ * The number of text hooks.
+ */
+#define EB_NUMBER_OF_HOOKS		54
+
+/*
+ * The number of search contexts required by a book.
+ */
+#define EB_NUMBER_OF_SEARCH_CONTEXTS	EB_MAX_MULTI_ENTRIES
+
+/*
+ * Types for various codes.
+ */
+typedef int EB_Error_Code;
+typedef int EB_Book_Code;
+typedef int EB_Disc_Code;
+typedef int EB_Case_Code;
+typedef int EB_Suffix_Code;
+typedef int EB_Character_Code;
+typedef int EB_Font_Code;
+typedef int EB_Word_Code;
+typedef int EB_Subbook_Code;
+typedef int EB_Index_Style_Code;
+typedef int EB_Search_Code;
+typedef int EB_Text_Code;
+typedef int EB_Text_Status_Code;
+typedef int EB_Multi_Search_Code;
+typedef int EB_Hook_Code;
+typedef int EB_Binary_Code;
+
+/*
+ * Typedef for Structures.
+ */
+#ifdef EB_ENABLE_PTHREAD
+typedef struct EB_Lock_Struct              EB_Lock;
+#endif
+typedef struct EB_Position_Struct          EB_Position;
+typedef struct EB_Alternation_Cache_Struct EB_Alternation_Cache;
+typedef struct EB_Appendix_Subbook_Struct  EB_Appendix_Subbook;
+typedef struct EB_Appendix_Struct          EB_Appendix;
+typedef struct EB_Font_Struct              EB_Font;
+typedef struct EB_Search_Struct            EB_Search;
+typedef struct EB_Multi_Search_Struct      EB_Multi_Search;
+typedef struct EB_Subbook_Struct           EB_Subbook;
+typedef struct EB_Text_Context_Struct      EB_Text_Context;
+typedef struct EB_Binary_Context_Struct    EB_Binary_Context;
+typedef struct EB_Search_Context_Struct    EB_Search_Context;
+typedef struct EB_Book_Struct              EB_Book;
+typedef struct EB_Hit_Struct               EB_Hit;
+typedef struct EB_Hook_Struct              EB_Hook;
+typedef struct EB_Hookset_Struct           EB_Hookset;
+typedef struct EB_BookList_Entry           EB_BookList_Entry;
+typedef struct EB_BookList                 EB_BookList;
+
+/*
+ * Pthreads lock.
+ */
+#ifdef EB_ENABLE_PTHREAD
+struct EB_Lock_Struct {
+    /*
+     * Lock count.  (For emulating recursive lock).
+     */
+    int lock_count;
+
+    /*
+     * Mutex for `lock_count'.
+     */
+    pthread_mutex_t lock_count_mutex;
+
+    /*
+     * Mutex for struct entity.
+     */
+    pthread_mutex_t entity_mutex;
+};
+#endif /* EB_ENABLE_PTHREAD */
+
+/*
+ * A pair of page and offset.
+ */
+struct EB_Position_Struct {
+    /*
+     * Page. (1, 2, 3 ...)
+     */
+    int page;
+
+    /*
+     * Offset in `page'. (0 ... 2047)
+     */
+    int offset;
+};
+
+/*
+ * Chace of aternation text.
+ */
+struct EB_Alternation_Cache_Struct {
+    /*
+     * Character number.
+     */
+    int character_number;
+
+    /*
+     * Alternation string for `char_no'.
+     */
+    char text[EB_MAX_ALTERNATION_TEXT_LENGTH + 1];
+};
+
+/*
+ * An appendix for a subbook.
+ */
+struct EB_Appendix_Subbook_Struct {
+
+    /*
+     * Initialization flag.
+     */
+    int initialized;
+
+    /*
+     * Subbook ID.
+     */
+    EB_Subbook_Code code;
+
+    /*
+     * Directory name.
+     */
+    char directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * Sub-directory name. (EPWING only)
+     */
+    char data_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * File name.
+     */
+    char file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+
+    /*
+     * Character code of the book.
+     */
+    EB_Character_Code character_code;
+
+    /*
+     * Start character number of the narrow/wide font.
+     */
+    int narrow_start;
+    int wide_start;
+
+    /*
+     * End character number of the narrow/wide font.
+     */
+    int narrow_end;
+    int wide_end;
+
+    /*
+     * Start page number of the narrow/wide font.
+     */
+    int narrow_page;
+    int wide_page;
+
+    /*
+     * Stop code (first and second characters).
+     */
+    int stop_code0;
+    int stop_code1;
+
+    /*
+     * Compression Information for appendix file.
+     */
+    Zio zio;
+};
+
+/*
+ * Additional resources for a book.
+ */
+struct EB_Appendix_Struct {
+    /*
+     * Book ID.
+     */
+    EB_Book_Code code;
+
+    /*
+     * Path of the book.
+     */
+    char *path;
+
+    /*
+     * The length of the path.
+     */
+    size_t path_length;
+
+    /*
+     * Disc type.  EB (EB/EBG/EBXA/EBXA-C/S-EBXA) or EPWING.
+     */
+    EB_Disc_Code disc_code;
+
+    /*
+     * The number of subbooks the book has.
+     */
+    int subbook_count;
+
+    /*
+     * Subbook list.
+     */
+    EB_Appendix_Subbook *subbooks;
+
+    /*
+     * Current subbook.
+     */
+    EB_Appendix_Subbook *subbook_current;
+
+    /*
+     * ebnet socket file. 
+     */
+#ifdef EB_ENABLE_EBNET
+    int ebnet_file;
+#endif
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+
+    /*
+     * Cache table for alternation text.
+     */
+    EB_Alternation_Cache narrow_cache[EB_MAX_ALTERNATION_CACHE];
+    EB_Alternation_Cache wide_cache[EB_MAX_ALTERNATION_CACHE];
+};
+
+/*
+ * A font in a subbook.
+ */
+struct EB_Font_Struct {
+    /*
+     * Font Code.
+     * This font is not available, if the code is EB_FONT_INVALID.
+     */
+    EB_Font_Code font_code;
+
+    /*
+     * Whether the object has been initialized.
+     */
+    int initialized;
+
+    /*
+     * Character numbers of the start and end of the font.
+     */
+    int start;
+    int end;
+
+    /*
+     * Page number of the start page of the font data.
+     * Used in EB* only. (In EPWING, it is alyways 1).
+     */
+    int page;
+
+    /*
+     * File name of the font. (EPWING only)
+     */
+    char file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+
+    /*
+     * Font data cache.
+     */
+    char *glyphs;
+
+    /*
+     * Compression Information.
+     */
+    Zio zio;
+};
+
+/*
+ * Search methods in a subbook.
+ */
+struct EB_Search_Struct {
+    /*
+     * Index ID.
+     */
+    int index_id;
+
+    /*
+     * Page number of the start page of an index.
+     * This search method is not available, if `start_page' is 0,
+     */
+    int start_page;
+    int end_page;
+
+    /*
+     * Page number of the start page of candidates.
+     * (for multi search entry)
+     */
+    int candidates_page;
+
+    /*
+     * Index style flags.
+     */
+    EB_Index_Style_Code katakana;
+    EB_Index_Style_Code lower;
+    EB_Index_Style_Code mark;
+    EB_Index_Style_Code long_vowel;
+    EB_Index_Style_Code double_consonant;
+    EB_Index_Style_Code contracted_sound;
+    EB_Index_Style_Code voiced_consonant;
+    EB_Index_Style_Code small_vowel;
+    EB_Index_Style_Code p_sound;
+    EB_Index_Style_Code space;
+
+    /*
+     * Label. (for an entry in multi search)
+     */
+    char label[EB_MAX_MULTI_LABEL_LENGTH + 1];
+};
+
+/*
+ * A multi-search entry in a subbook.
+ */
+struct EB_Multi_Search_Struct {
+    /*
+     * Search method information.
+     */
+    EB_Search search;
+
+    /*
+     * Search title. (EPWING only)
+     */
+    char title[EB_MAX_MULTI_TITLE_LENGTH + 1];
+
+    /*
+     * The number of entries the multi search has.
+     */
+    int entry_count;
+
+    /*
+     * List of Word entry information.
+     */
+    EB_Search entries[EB_MAX_MULTI_ENTRIES];
+};
+
+/*
+ * A subbook in a book.
+ */
+struct EB_Subbook_Struct {
+    /*
+     * Whether the object has been initialized.
+     */
+    int initialized;
+
+    /*
+     * Index page.
+     */
+    int index_page;
+
+    /*
+     * Subbook ID.
+     * This subbook is not available, if the code is EB_SUBBOOK_INVALID.
+     */
+    EB_Subbook_Code code;
+
+    /*
+     * File descriptor and compression information for text file.
+     */
+    Zio text_zio;
+
+    /*
+     * File descriptor and compression information for graphic file.
+     */
+    Zio graphic_zio;
+
+    /*
+     * File descriptor and compression information for sound file.
+     */
+    Zio sound_zio;
+
+    /*
+     * File descriptor and compression information for movie file.
+     */
+    Zio movie_zio;
+
+    /*
+     * Title of the subbook.
+     */
+    char title[EB_MAX_TITLE_LENGTH + 1];
+
+    /*
+     * Subbook directory name.
+     */
+    char directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * Sub-directory names. (EPWING only)
+     */
+    char data_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+    char gaiji_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+    char movie_directory_name[EB_MAX_DIRECTORY_NAME_LENGTH + 1];
+
+    /*
+     * File names.
+     */
+    char text_file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+    char graphic_file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+    char sound_file_name[EB_MAX_FILE_NAME_LENGTH + 1];
+
+    /*
+     * Compression hints of Text, graphic and sound files.
+     * (temporary need, EPWING only).
+     */
+    Zio_Code text_hint_zio_code;
+    Zio_Code graphic_hint_zio_code;
+    Zio_Code sound_hint_zio_code;
+
+    /*
+     * Page number where search method titles are stored.
+     * (temporary need, EPWING only).
+     */
+    int search_title_page;
+
+    /*
+     * The top page of search methods.
+     */
+    EB_Search word_alphabet;
+    EB_Search word_asis;
+    EB_Search word_kana;
+    EB_Search endword_alphabet;
+    EB_Search endword_asis;
+    EB_Search endword_kana;
+    EB_Search keyword;
+    EB_Search menu;
+    EB_Search image_menu;
+    EB_Search cross;
+    EB_Search copyright;
+    EB_Search text;
+    EB_Search sound;
+
+    /*
+     * The number of multi-search methods the subbook has.
+     */
+    int multi_count;
+
+    /*
+     * The top page of multi search methods.
+     */
+    EB_Multi_Search multis[EB_MAX_MULTI_SEARCHES];
+
+    /*
+     * Font list.
+     */
+    EB_Font narrow_fonts[EB_MAX_FONTS];
+    EB_Font wide_fonts[EB_MAX_FONTS];
+
+    /*
+     * Current narrow and wide fonts.
+     */
+    EB_Font *narrow_current;
+    EB_Font *wide_current;
+};
+
+/*
+ * Length of cache buffer in a binary context.
+ * It must be greater than 38, size of GIF preamble.
+ * It must be greater than 44, size of WAVE sound header.
+ * It must be greater than 118, size of BMP header + info + 16 rgbquads.
+ */
+#define EB_SIZE_BINARY_CACHE_BUFFER	128
+
+/*
+ * Context parameters for binary data.
+ */
+struct EB_Binary_Context_Struct {
+    /*
+     * Binary type ID.
+     * The context is not active, if this code is EB_BINARY_INVALID.
+     */
+    EB_Binary_Code code;
+
+    /*
+     * Compress information.
+     */
+    Zio *zio;
+
+    /*
+     * Location of the the binary data, relative to the start of the file.
+     */
+    off_t location;
+
+    /*
+     * Data size.
+     * Size zero means that the binary has no size information.
+     */
+    size_t size;
+
+    /*
+     * The current offset of binary data.
+     */
+    size_t offset;
+
+    /*
+     * Cache buffer.
+     */
+    char cache_buffer[EB_SIZE_BINARY_CACHE_BUFFER];
+
+    /*
+     * Length of cached data.
+     */
+    size_t cache_length;
+
+    /*
+     * Current offset of cached data.
+     */
+    size_t cache_offset;
+
+    /*
+     * Width of Image. (monochrome graphic only)
+     */
+    int width;
+};
+
+/*
+ * Context parameters for text reading.
+ */
+struct EB_Text_Context_Struct {
+    /*
+     * Current text content type.
+     * The context is not active, if this code is EB_TEXT_INVALID.
+     */
+    EB_Text_Code code;
+
+    /*
+     * Current offset pointer of the START or HONMON file.
+     */
+    off_t location;
+
+    /*
+     * The current point of a buffer on which text is written.
+     */
+    char *out;
+
+    /*
+     * Length of `out'.
+     */
+    size_t out_rest_length;
+    
+    /*
+     * Unprocessed string that a hook function writes on text.
+     */
+    char *unprocessed;
+
+    /*
+     * Size of `unprocessed'.
+     */
+    size_t unprocessed_size;
+
+    /*
+     * Length of the current output text phrase.
+     */
+    size_t out_step;
+
+    /*
+     * Narrow character region flag.
+     */
+    int narrow_flag;
+
+    /*
+     * Whether a printable character has been appeared in the current
+     * text content.
+     */
+    int printable_count;
+
+    /* 
+     * EOF flag of the current subbook.
+     */
+    int file_end_flag;
+
+    /*
+     * Status of the current text processing.
+     */
+    EB_Text_Status_Code text_status;
+
+    /*
+     * Skip until `skipcode' appears.
+     */
+    int skip_code;
+
+    /*
+     * Stop-code automatically set by EB Library.
+     */
+    int auto_stop_code;
+
+    /*
+     * The current candidate word for multi search.
+     */
+    char candidate[EB_MAX_WORD_LENGTH + 1];
+
+    /*
+     * Whether the current text point is in the candidate word or not.
+     */
+    int is_candidate;
+
+    /*
+     * Whether the current text point is in EBXA-C gaiji area.
+     */
+    int ebxac_gaiji_flag;
+};
+
+/*
+ * Context parameters for word search.
+ */
+struct EB_Search_Context_Struct {
+    /*
+     * Current search method type.
+     * The context is not active, if this code is EB_SEARCH_NONE.
+     */
+    EB_Search_Code code;
+
+    /*
+     * Function which compares word to search and pattern in an index page.
+     */
+    int (*compare_pre)(const char *word, const char *pattern,
+	size_t length);
+    int (*compare_single)(const char *word, const char *pattern,
+	size_t length);
+    int (*compare_group)(const char *word, const char *pattern,
+	size_t length);
+
+    /*
+     * Result of comparison by `compare'.
+     */
+    int comparison_result;
+
+    /*
+     * Word to search.
+     */
+    char word[EB_MAX_WORD_LENGTH + 1];
+
+    /*
+     * Canonicalized word to search.
+     */
+    char canonicalized_word[EB_MAX_WORD_LENGTH + 1];
+
+    /*
+     * Page which is searched currently.
+     */
+    int page;
+
+    /*
+     * Offset which is searched currently in the page.
+     */
+    int offset;
+
+    /*
+     * Page ID of the current page.
+     */
+    int page_id;
+
+    /*
+     * How many entries in the current page.
+     */
+    int entry_count;
+
+    /*
+     * Entry index pointer.
+     */
+    int entry_index;
+
+    /*
+     * Length of the current entry.
+     */
+    int entry_length;
+
+    /*
+     * Arrangement style of entries in the current page (fixed or variable).
+     */
+    int entry_arrangement;
+
+    /*
+     * In a group entry or not.
+     */
+    int in_group_entry;
+
+    /*
+     * Current heading position (for keyword search).
+     */
+    EB_Position keyword_heading;
+};
+
+/*
+ * A book.
+ */
+struct EB_Book_Struct {
+    /*
+     * Book ID.
+     */
+    EB_Book_Code code;
+
+    /*
+     * Disc type.  EB* or EPWING.
+     */
+    EB_Disc_Code disc_code;
+
+    /*
+     * Character code of the book.
+     */
+    EB_Character_Code character_code;
+
+    /*
+     * Path of the book.
+     */
+    char *path;
+
+    /*
+     * The length of the path.
+     */
+    size_t path_length;
+
+    /*
+     * The number of subbooks the book has.
+     */
+    int subbook_count;
+
+    /*
+     * Subbook list.
+     */
+    EB_Subbook *subbooks;
+
+    /*
+     * Current subbook.
+     */
+    EB_Subbook *subbook_current;
+
+    /*
+     * Context parameters for text reading.
+     */
+    EB_Text_Context text_context;
+
+    /*
+     * Context parameters for binary reading.
+     */
+    EB_Binary_Context binary_context;
+
+    /*
+     * Context parameters for text reading.
+     */
+    EB_Search_Context search_contexts[EB_NUMBER_OF_SEARCH_CONTEXTS];
+
+    /*
+     * ebnet socket file. 
+     */
+#ifdef EB_ENABLE_EBNET
+    int ebnet_file;
+#endif
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+};
+
+/*
+ * In a word search, heading and text locations of a matched entry
+ * are stored.
+ */
+struct EB_Hit_Struct {
+    /*
+     * Heading position.
+     */
+    EB_Position heading;
+
+    /*
+     * Text position.
+     */
+    EB_Position text;
+};
+
+/*
+ * A text hook.
+ */
+struct EB_Hook_Struct {
+    /*
+     * Hook code.
+     */
+    EB_Hook_Code code;
+
+    /*
+     * Hook function for the hook code `code'.
+     */
+    EB_Error_Code (*function)(EB_Book *book, EB_Appendix *appendix,
+	void *container, EB_Hook_Code hook_code, int argc,
+	const unsigned int *argv);
+};
+
+/*
+ * A set of text hooks.
+ */
+struct EB_Hookset_Struct {
+    /*
+     * List of hooks.
+     */
+    EB_Hook hooks[EB_NUMBER_OF_HOOKS];
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+};
+
+/*
+ * An entry of book list.
+ */
+struct EB_BookList_Entry {
+    /*
+     * name.
+     */
+    char *name;
+
+    /*
+     * Title.
+     */
+    char *title;
+};
+
+/*
+ * Book list.
+ */
+struct EB_BookList {
+    /*
+     * Book List ID.
+     */
+    EB_Book_Code code;
+
+    /*
+     * The number of book entries this list has.
+     */
+    int entry_count;
+
+    /*
+     * The maximum number of book entries that `entries' can memory.
+     */
+    int max_entry_count;
+
+    /*
+     * Book entries.
+     */
+    EB_BookList_Entry *entries;
+
+    /*
+     * Lock.
+     */
+#ifdef EB_ENABLE_PTHREAD
+    EB_Lock lock;
+#endif
+};
+
+/* for backward compatibility */
+#define EB_Multi_Entry_Code int
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_DEFS_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/eb.h goldendict-1.5.0~git20150923/winlibs/include/eb/eb.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/eb.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/eb.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,155 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_EB_H
+#define EB_EB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+#include <stdarg.h>
+
+/*
+ * Function declarations.
+ */
+/* book.c */
+void eb_initialize_book(EB_Book *book);
+EB_Error_Code eb_bind(EB_Book *book, const char *path);
+void eb_finalize_book(EB_Book *book);
+int eb_is_bound(EB_Book *book);
+EB_Error_Code eb_path(EB_Book *book, char *path);
+EB_Error_Code eb_disc_type(EB_Book *book, EB_Disc_Code *disc_code);
+EB_Error_Code eb_character_code(EB_Book *book,
+    EB_Character_Code *character_code);
+
+/* copyright.h */
+int eb_have_copyright(EB_Book *book);
+EB_Error_Code eb_copyright(EB_Book *book, EB_Position *position);
+EB_Error_Code eb_search_cross(EB_Book *book,
+    const char * const input_words[]);
+
+/* cross.c */
+int eb_have_cross_search(EB_Book *book);
+
+/* eb.c */
+EB_Error_Code eb_initialize_library(void);
+void eb_finalize_library(void);
+
+/* endword.c */
+int eb_have_endword_search(EB_Book *book);
+EB_Error_Code eb_search_endword(EB_Book *book, const char *input_word);
+
+/* exactword.c */
+int eb_have_exactword_search(EB_Book *book);
+EB_Error_Code eb_search_exactword(EB_Book *book, const char *input_word);
+
+/* graphic.c */
+int eb_have_graphic_search(EB_Book *book);
+
+/* keyword.c */
+int eb_have_keyword_search(EB_Book *book);
+EB_Error_Code eb_search_keyword(EB_Book *book,
+    const char * const input_words[]);
+
+/* lock.c */
+int eb_pthread_enabled(void);
+
+/* log.c */
+void eb_set_log_function(void (*function)(const char *message, va_list ap));
+void eb_enable_log(void);
+void eb_disable_log(void);
+void eb_log(const char *message, ...);
+void eb_log_stderr(const char *message, va_list ap);
+
+/* menu.c */
+int eb_have_menu(EB_Book *book);
+EB_Error_Code eb_menu(EB_Book *book, EB_Position *position);
+int eb_have_image_menu(EB_Book *book);
+EB_Error_Code eb_image_menu(EB_Book *book, EB_Position *position);
+
+/* multi.c */
+int eb_have_multi_search(EB_Book *book);
+EB_Error_Code eb_multi_title(EB_Book *book, EB_Multi_Search_Code multi_id,
+    char *title);
+EB_Error_Code eb_multi_search_list(EB_Book *book,
+    EB_Multi_Search_Code *search_list, int *search_count);
+EB_Error_Code eb_multi_entry_count(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int *entry_count);
+EB_Error_Code eb_multi_entry_list(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int *entry_list, int *entry_count);
+EB_Error_Code eb_multi_entry_label(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int entry_index, char *label);
+int eb_multi_entry_have_candidates(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int entry_index);
+EB_Error_Code eb_multi_entry_candidates(EB_Book *book,
+    EB_Multi_Search_Code multi_id, int entry_index, EB_Position *position);
+EB_Error_Code eb_search_multi(EB_Book *book, EB_Multi_Search_Code multi_id,
+    const char * const input_words[]);
+
+/* text.c */
+int eb_have_text(EB_Book *book);
+EB_Error_Code eb_text(EB_Book *book, EB_Position *position);
+
+/* search.c */
+EB_Error_Code eb_hit_list(EB_Book *book, int max_hit_count, EB_Hit *hit_list,
+    int *hit_count);
+
+/* subbook.c */
+EB_Error_Code eb_load_all_subbooks(EB_Book *book);
+EB_Error_Code eb_subbook_list(EB_Book *book, EB_Subbook_Code *subbook_list,
+    int *subbook_count);
+EB_Error_Code eb_subbook(EB_Book *book, EB_Subbook_Code *subbook_code);
+EB_Error_Code eb_subbook_title(EB_Book *book, char *title);
+EB_Error_Code eb_subbook_title2(EB_Book *book, EB_Subbook_Code subbook_code,
+    char *title);
+EB_Error_Code eb_subbook_directory(EB_Book *book, char *directory);
+EB_Error_Code eb_subbook_directory2(EB_Book *book,
+    EB_Subbook_Code subbook_code, char *directory);
+EB_Error_Code eb_set_subbook(EB_Book *book, EB_Subbook_Code subbook_code);
+void eb_unset_subbook(EB_Book *book);
+
+/* word.c */
+int eb_have_word_search(EB_Book *book);
+EB_Error_Code eb_search_word(EB_Book *book, const char *input_word);
+
+/* for backward compatibility */
+#define eb_suspend eb_unset_subbook
+#define eb_initialize_all_subbooks eb_load_all_subbooks
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_EB_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/error.h goldendict-1.5.0~git20150923/winlibs/include/eb/error.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/error.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/error.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,150 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_ERROR_H
+#define EB_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Error codes.
+ */
+#define EB_SUCCESS			0
+#define EB_ERR_MEMORY_EXHAUSTED		1
+#define EB_ERR_EMPTY_FILE_NAME		2
+#define EB_ERR_TOO_LONG_FILE_NAME	3
+#define EB_ERR_BAD_FILE_NAME		4
+
+#define EB_ERR_BAD_DIR_NAME		5
+#define EB_ERR_TOO_LONG_WORD		6
+#define EB_ERR_BAD_WORD			7
+#define EB_ERR_EMPTY_WORD		8
+#define EB_ERR_FAIL_GETCWD		9
+
+#define EB_ERR_FAIL_OPEN_CAT		10
+#define EB_ERR_FAIL_OPEN_CATAPP		11
+#define EB_ERR_FAIL_OPEN_TEXT		12
+#define EB_ERR_FAIL_OPEN_FONT		13
+#define EB_ERR_FAIL_OPEN_APP		14
+
+#define EB_ERR_FAIL_OPEN_BINARY		15
+#define EB_ERR_FAIL_READ_CAT		16
+#define EB_ERR_FAIL_READ_CATAPP		17
+#define EB_ERR_FAIL_READ_TEXT		18
+#define EB_ERR_FAIL_READ_FONT		19
+
+#define EB_ERR_FAIL_READ_APP		20
+#define EB_ERR_FAIL_READ_BINARY		21
+#define EB_ERR_FAIL_SEEK_CAT		22
+#define EB_ERR_FAIL_SEEK_CATAPP		23
+#define EB_ERR_FAIL_SEEK_TEXT		24
+
+#define EB_ERR_FAIL_SEEK_FONT		25
+#define EB_ERR_FAIL_SEEK_APP		26
+#define EB_ERR_FAIL_SEEK_BINARY		27
+#define EB_ERR_UNEXP_CAT		28
+#define EB_ERR_UNEXP_CATAPP		29
+
+#define EB_ERR_UNEXP_TEXT		30
+#define EB_ERR_UNEXP_FONT		31
+#define EB_ERR_UNEXP_APP		32
+#define EB_ERR_UNEXP_BINARY		33
+#define EB_ERR_UNBOUND_BOOK		34
+
+#define EB_ERR_UNBOUND_APP		35
+#define EB_ERR_NO_SUB			36
+#define EB_ERR_NO_APPSUB		37
+#define EB_ERR_NO_FONT			38
+#define EB_ERR_NO_TEXT			39
+
+#define EB_ERR_NO_STOPCODE		40
+#define EB_ERR_NO_ALT			41
+#define EB_ERR_NO_CUR_SUB		42
+#define EB_ERR_NO_CUR_APPSUB		43
+#define EB_ERR_NO_CUR_FONT		44
+
+#define EB_ERR_NO_CUR_BINARY		45
+#define EB_ERR_NO_SUCH_SUB		46
+#define EB_ERR_NO_SUCH_APPSUB		47
+#define EB_ERR_NO_SUCH_FONT		48
+#define EB_ERR_NO_SUCH_CHAR_BMP		49
+
+#define EB_ERR_NO_SUCH_CHAR_TEXT	50
+#define EB_ERR_NO_SUCH_SEARCH		51
+#define EB_ERR_NO_SUCH_HOOK		52
+#define EB_ERR_NO_SUCH_BINARY		53
+#define EB_ERR_DIFF_CONTENT		54
+
+#define EB_ERR_NO_PREV_SEARCH		55
+#define EB_ERR_NO_SUCH_MULTI_ID		56
+#define EB_ERR_NO_SUCH_ENTRY_ID		57
+#define EB_ERR_TOO_MANY_WORDS		58
+#define EB_ERR_NO_WORD			59
+
+#define EB_ERR_NO_CANDIDATES		60
+#define EB_ERR_END_OF_CONTENT		61
+#define EB_ERR_NO_PREV_SEEK		62
+#define EB_ERR_EBNET_UNSUPPORTED	63
+#define EB_ERR_EBNET_FAIL_CONNECT	64
+
+#define EB_ERR_EBNET_SERVER_BUSY	65
+#define EB_ERR_EBNET_NO_PERMISSION	66
+#define EB_ERR_UNBOUND_BOOKLIST		67
+#define EB_ERR_NO_SUCH_BOOK		68
+
+
+/*
+ * The number of error codes.
+ */
+#define EB_NUMBER_OF_ERRORS		69
+
+/*
+ * The maximum length of an error message.
+ */
+#define EB_MAX_ERROR_MESSAGE_LENGTH	127
+
+/*
+ * Function declarations.
+ */
+/* error.c */
+const char *eb_error_string(EB_Error_Code error_code);
+const char *eb_error_message(EB_Error_Code error_code);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_ERROR_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/font.h goldendict-1.5.0~git20150923/winlibs/include/eb/font.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/font.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/font.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,200 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_FONT_H
+#define EB_FONT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Font types.
+ */
+#define EB_FONT_16		0
+#define EB_FONT_24		1
+#define EB_FONT_30		2
+#define EB_FONT_48		3
+#define EB_FONT_INVALID		-1
+
+/*
+ * Font sizes.
+ */
+#define EB_SIZE_NARROW_FONT_16		16
+#define EB_SIZE_WIDE_FONT_16		32
+#define EB_SIZE_NARROW_FONT_24		48
+#define EB_SIZE_WIDE_FONT_24		72
+#define EB_SIZE_NARROW_FONT_30		60
+#define EB_SIZE_WIDE_FONT_30		120
+#define EB_SIZE_NARROW_FONT_48		144
+#define EB_SIZE_WIDE_FONT_48		288
+
+/*
+ * Font width.
+ */
+#define EB_WIDTH_NARROW_FONT_16		8
+#define EB_WIDTH_WIDE_FONT_16		16
+#define EB_WIDTH_NARROW_FONT_24		16
+#define EB_WIDTH_WIDE_FONT_24		24
+#define EB_WIDTH_NARROW_FONT_30		16
+#define EB_WIDTH_WIDE_FONT_30		32
+#define EB_WIDTH_NARROW_FONT_48		24
+#define EB_WIDTH_WIDE_FONT_48		48
+
+/*
+ * Font height.
+ */
+#define EB_HEIGHT_FONT_16		16
+#define EB_HEIGHT_FONT_24		24
+#define EB_HEIGHT_FONT_30		30
+#define EB_HEIGHT_FONT_48		48
+
+/*
+ * Bitmap image sizes.
+ */
+#define EB_SIZE_NARROW_FONT_16_XBM		184
+#define EB_SIZE_WIDE_FONT_16_XBM		284
+#define EB_SIZE_NARROW_FONT_16_XPM		266
+#define EB_SIZE_WIDE_FONT_16_XPM		395
+#define EB_SIZE_NARROW_FONT_16_GIF		186
+#define EB_SIZE_WIDE_FONT_16_GIF		314
+#define EB_SIZE_NARROW_FONT_16_BMP		126
+#define EB_SIZE_WIDE_FONT_16_BMP		126
+#define EB_SIZE_NARROW_FONT_16_PNG		131
+#define EB_SIZE_WIDE_FONT_16_PNG		147
+
+#define EB_SIZE_NARROW_FONT_24_XBM		383
+#define EB_SIZE_WIDE_FONT_24_XBM		533
+#define EB_SIZE_NARROW_FONT_24_XPM		555
+#define EB_SIZE_WIDE_FONT_24_XPM		747
+#define EB_SIZE_NARROW_FONT_24_GIF		450
+#define EB_SIZE_WIDE_FONT_24_GIF		642
+#define EB_SIZE_NARROW_FONT_24_BMP		158
+#define EB_SIZE_WIDE_FONT_24_BMP		158
+#define EB_SIZE_NARROW_FONT_24_PNG		171
+#define EB_SIZE_WIDE_FONT_24_PNG		195
+
+#define EB_SIZE_NARROW_FONT_30_XBM		458
+#define EB_SIZE_WIDE_FONT_30_XBM		833
+#define EB_SIZE_NARROW_FONT_30_XPM		675
+#define EB_SIZE_WIDE_FONT_30_XPM		1155
+#define EB_SIZE_NARROW_FONT_30_GIF		552
+#define EB_SIZE_WIDE_FONT_30_GIF		1032
+#define EB_SIZE_NARROW_FONT_30_BMP		182
+#define EB_SIZE_WIDE_FONT_30_BMP		182
+#define EB_SIZE_NARROW_FONT_30_PNG		189
+#define EB_SIZE_WIDE_FONT_30_PNG		249
+
+#define EB_SIZE_NARROW_FONT_48_XBM		983
+#define EB_SIZE_WIDE_FONT_48_XBM		1883
+#define EB_SIZE_NARROW_FONT_48_XPM		1419
+#define EB_SIZE_WIDE_FONT_48_XPM		2571
+#define EB_SIZE_NARROW_FONT_48_GIF		1242
+#define EB_SIZE_WIDE_FONT_48_GIF		2394
+#define EB_SIZE_NARROW_FONT_48_BMP		254
+#define EB_SIZE_WIDE_FONT_48_BMP		446
+#define EB_SIZE_NARROW_FONT_48_PNG		291
+#define EB_SIZE_WIDE_FONT_48_PNG		435
+
+#define EB_SIZE_FONT_IMAGE	EB_SIZE_WIDE_FONT_48_XPM	    
+
+/*
+ * Function declarations.
+ */
+/* bitmap.c */
+EB_Error_Code eb_narrow_font_xbm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_xpm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_gif_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_bmp_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_png_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_xbm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_xpm_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_gif_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_bmp_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_png_size(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_bitmap_to_xbm(const char *bitmap, int width, int height,
+    char *xbm, size_t *xbm_length);
+EB_Error_Code eb_bitmap_to_xpm(const char *bitmap, int width, int height,
+    char *xpm, size_t *xpm_length);
+EB_Error_Code eb_bitmap_to_gif(const char *bitmap, int width, int height,
+    char *gif, size_t *gif_length);
+EB_Error_Code eb_bitmap_to_bmp(const char *bitmap, int width, int height,
+    char *bmp, size_t *bmp_length);
+EB_Error_Code eb_bitmap_to_png(const char *bitmap, int width, int height,
+    char *png, size_t *png_length);
+
+/* font.c */
+EB_Error_Code eb_font(EB_Book *book, EB_Font_Code *font_code);
+EB_Error_Code eb_set_font(EB_Book *book, EB_Font_Code font_code);
+void eb_unset_font(EB_Book *book);
+EB_Error_Code eb_font_list(EB_Book *book, EB_Font_Code *font_list,
+    int *font_count);
+int eb_have_font(EB_Book *book, EB_Font_Code font_code);
+EB_Error_Code eb_font_height(EB_Book *book, int *height);
+EB_Error_Code eb_font_height2(EB_Font_Code font_code, int *height);
+
+/* narwfont.c */
+int eb_have_narrow_font(EB_Book *book);
+EB_Error_Code eb_narrow_font_width(EB_Book *book, int *width);
+EB_Error_Code eb_narrow_font_width2(EB_Font_Code font_code, int *width);
+EB_Error_Code eb_narrow_font_size(EB_Book *book, size_t *size);
+EB_Error_Code eb_narrow_font_size2(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_narrow_font_start(EB_Book *book, int *start);
+EB_Error_Code eb_narrow_font_end(EB_Book *book, int *end);
+EB_Error_Code eb_narrow_font_character_bitmap(EB_Book *book, int, char *);
+EB_Error_Code eb_forward_narrow_font_character(EB_Book *book, int, int *);
+EB_Error_Code eb_backward_narrow_font_character(EB_Book *book, int, int *);
+
+/* widefont.c */
+int eb_have_wide_font(EB_Book *book);
+EB_Error_Code eb_wide_font_width(EB_Book *book, int *width);
+EB_Error_Code eb_wide_font_width2(EB_Font_Code font_code, int *width);
+EB_Error_Code eb_wide_font_size(EB_Book *book, size_t *size);
+EB_Error_Code eb_wide_font_size2(EB_Font_Code font_code, size_t *size);
+EB_Error_Code eb_wide_font_start(EB_Book *book, int *start);
+EB_Error_Code eb_wide_font_end(EB_Book *book, int *end);
+EB_Error_Code eb_wide_font_character_bitmap(EB_Book *book,
+    int character_number, char *bitmap);
+EB_Error_Code eb_forward_wide_font_character(EB_Book *book, int n,
+    int *character_number);
+EB_Error_Code eb_backward_wide_font_character(EB_Book *book, int n,
+    int *character_number);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_FONT_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/sysdefs.h goldendict-1.5.0~git20150923/winlibs/include/eb/sysdefs.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/sysdefs.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/sysdefs.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,4 @@
+/* automatically generated by Makefile. */
+#define EB_VERSION_STRING "4.4.3"
+#define EB_VERSION_MAJOR 4
+#define EB_VERSION_MINOR 4
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/text.h goldendict-1.5.0~git20150923/winlibs/include/eb/text.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/text.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/text.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,166 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 1997-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef EB_TEXT_H
+#define EB_TEXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef EB_BUILD_LIBRARY
+#include "defs.h"
+#else
+#include <eb/defs.h>
+#endif
+
+/*
+ * Hook codes.
+ * (When you add or remove a hook, update EB_NUMER_OF_HOOKS in defs.h.)
+ */
+#define EB_HOOK_NULL			-1
+#define EB_HOOK_INITIALIZE		0
+#define EB_HOOK_BEGIN_NARROW		1
+#define EB_HOOK_END_NARROW		2
+#define EB_HOOK_BEGIN_SUBSCRIPT		3
+#define EB_HOOK_END_SUBSCRIPT		4
+
+#define EB_HOOK_SET_INDENT		5
+#define EB_HOOK_NEWLINE			6
+#define EB_HOOK_BEGIN_SUPERSCRIPT	7
+#define EB_HOOK_END_SUPERSCRIPT		8
+#define EB_HOOK_BEGIN_NO_NEWLINE	9
+
+#define EB_HOOK_END_NO_NEWLINE		10
+#define EB_HOOK_BEGIN_EMPHASIS		11
+#define EB_HOOK_END_EMPHASIS		12
+#define EB_HOOK_BEGIN_CANDIDATE		13
+#define EB_HOOK_END_CANDIDATE_GROUP	14
+
+#define EB_HOOK_END_CANDIDATE_LEAF	15
+#define EB_HOOK_BEGIN_REFERENCE		16
+#define EB_HOOK_END_REFERENCE		17
+#define EB_HOOK_BEGIN_KEYWORD		18
+#define EB_HOOK_END_KEYWORD		19
+
+#define EB_HOOK_NARROW_FONT		20
+#define EB_HOOK_WIDE_FONT		21
+#define EB_HOOK_ISO8859_1		22
+#define EB_HOOK_NARROW_JISX0208		23
+#define EB_HOOK_WIDE_JISX0208		24
+
+#define EB_HOOK_GB2312			25
+#define EB_HOOK_BEGIN_MONO_GRAPHIC	26
+#define EB_HOOK_END_MONO_GRAPHIC	27
+#define EB_HOOK_BEGIN_GRAY_GRAPHIC	28
+#define EB_HOOK_END_GRAY_GRAPHIC	29
+
+#define EB_HOOK_BEGIN_COLOR_BMP		30
+#define EB_HOOK_BEGIN_COLOR_JPEG	31
+#define EB_HOOK_BEGIN_IN_COLOR_BMP	32
+#define EB_HOOK_BEGIN_IN_COLOR_JPEG	33
+#define EB_HOOK_END_COLOR_GRAPHIC	34
+
+#define EB_HOOK_END_IN_COLOR_GRAPHIC	35
+#define EB_HOOK_BEGIN_WAVE		36
+#define EB_HOOK_END_WAVE		37
+#define EB_HOOK_BEGIN_MPEG		38
+#define EB_HOOK_END_MPEG		39
+
+#define EB_HOOK_BEGIN_GRAPHIC_REFERENCE	40
+#define EB_HOOK_END_GRAPHIC_REFERENCE	41
+#define EB_HOOK_GRAPHIC_REFERENCE	42
+#define EB_HOOK_BEGIN_DECORATION	43
+#define EB_HOOK_END_DECORATION		44
+
+#define EB_HOOK_BEGIN_IMAGE_PAGE        45
+#define EB_HOOK_END_IMAGE_PAGE          46
+#define EB_HOOK_BEGIN_CLICKABLE_AREA    47
+#define EB_HOOK_END_CLICKABLE_AREA      48
+
+#define EB_HOOK_BEGIN_UNICODE		49
+#define EB_HOOK_END_UNICODE		50
+#define EB_HOOK_BEGIN_EBXAC_GAIJI	51
+#define EB_HOOK_END_EBXAC_GAIJI		52
+#define EB_HOOK_EBXAC_GAIJI		53
+
+/*
+ * Function declarations.
+ */
+/* hook.c */
+void eb_initialize_hookset(EB_Hookset *hookset);
+void eb_finalize_hookset(EB_Hookset *hookset);
+EB_Error_Code eb_set_hook(EB_Hookset *hookset, const EB_Hook *hook);
+EB_Error_Code eb_set_hooks(EB_Hookset *hookset, const EB_Hook *hook);
+EB_Error_Code eb_hook_euc_to_ascii(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_stop_code(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_narrow_character_text(EB_Book *book,
+    EB_Appendix *appendix, void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_wide_character_text(EB_Book *book,
+    EB_Appendix *appendix, void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_newline(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+EB_Error_Code eb_hook_empty(EB_Book *book, EB_Appendix *appendix,
+    void *container, EB_Hook_Code hook_code, int argc,
+    const unsigned int *argv);
+
+/* readtext.c */
+EB_Error_Code eb_seek_text(EB_Book *book, const EB_Position *position);
+EB_Error_Code eb_tell_text(EB_Book *book, EB_Position *position);
+EB_Error_Code eb_read_text(EB_Book *book, EB_Appendix *appendix,
+    EB_Hookset *hookset, void *container, size_t text_max_length, char *text,
+    ssize_t *text_length);
+EB_Error_Code eb_read_heading(EB_Book *book, EB_Appendix *appendix,
+    EB_Hookset *hookset, void *container, size_t text_max_length, char *text,
+    ssize_t *text_length);
+EB_Error_Code eb_read_rawtext(EB_Book *book, size_t text_max_length,
+    char *text, ssize_t *text_length);
+int eb_is_text_stopped(EB_Book *book);
+EB_Error_Code eb_write_text_byte1(EB_Book *book, int byte1);
+EB_Error_Code eb_write_text_byte2(EB_Book *book, int byte1, int byte2);
+EB_Error_Code eb_write_text_string(EB_Book *book, const char *string);
+EB_Error_Code eb_write_text(EB_Book *book, const char * stream,
+    size_t stream_length);
+const char *eb_current_candidate(EB_Book *book);
+EB_Error_Code eb_forward_text(EB_Book *book, EB_Appendix *appendix);
+EB_Error_Code eb_backward_text(EB_Book *book, EB_Appendix *appendix);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not EB_TEXT_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/eb/zio.h goldendict-1.5.0~git20150923/winlibs/include/eb/zio.h
--- goldendict-1.5.0~git20131003/winlibs/include/eb/zio.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/eb/zio.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,237 @@
+/*                                                            -*- C -*-
+ * Copyright (c) 2001-2006  Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef ZIO_H
+#define ZIO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+#include <time.h>
+
+/*
+ * Header size of the ebzip compression file.
+ */
+#define ZIO_SIZE_EBZIP_HEADER		22
+
+/*
+ * Margin size for ebzip compression buffer.
+ * (Since compressed data is larger than original in the worst case,
+ * we must add margin to a compression buffer.)
+ */
+#define ZIO_SIZE_EBZIP_MARGIN		1024
+
+/*
+ * Maximum ebzio compression level.
+ */
+#define ZIO_MAX_EBZIP_LEVEL		5
+
+/*
+ * Huffman node types.
+ */
+#define ZIO_HUFFMAN_NODE_INTERMEDIATE	0
+#define ZIO_HUFFMAN_NODE_EOF		1
+#define ZIO_HUFFMAN_NODE_LEAF8		2
+#define ZIO_HUFFMAN_NODE_LEAF16		3
+#define ZIO_HUFFMAN_NODE_LEAF32		4
+
+/*
+ * Compression type codes.
+ */
+#define ZIO_PLAIN			0
+#define ZIO_EBZIP1			1
+#define ZIO_EPWING			2
+#define ZIO_EPWING6			3
+#define ZIO_SEBXA			4
+#define ZIO_INVALID        		-1
+#define ZIO_REOPEN			-2
+
+/*
+ * Compression type.
+ */
+typedef int Zio_Code;
+
+/*
+ * A node of static Huffman tree.
+ */
+typedef struct Zio_Huffman_Node_Struct Zio_Huffman_Node;
+
+struct Zio_Huffman_Node_Struct {
+    /*
+     * node type (ITNERMEDIATE, LEAF8, LEAF16, LEAF32 or EOF).
+     */
+    int type;
+
+    /*
+     * Value of a leaf node.
+     */
+    unsigned int value;
+
+    /*
+     * Frequency of a node.
+     */
+    int frequency;
+
+    /*
+     * Left child.
+     */
+    Zio_Huffman_Node *left;
+
+    /*
+     * Right child.
+     */
+    Zio_Huffman_Node *right;
+};
+
+/*
+ * Compression information of a book.
+ */
+typedef struct Zio_Struct Zio;
+
+struct Zio_Struct {
+    /*
+     * ID.
+     */
+    int id;
+
+    /*
+     * Zio type. (PLAIN, EBZIP, EPWING, EPWING6 or SEBXA)
+     */
+    Zio_Code code;
+
+    /*
+     * File descriptor.
+     */
+    int file;
+
+    /*
+     * Current location.
+     */
+    off_t location;
+
+    /*
+     * Size of an uncompressed file.
+     */
+    off_t file_size;
+
+    /*
+     * Slice size of an EBZIP compressed file.
+     */
+    size_t slice_size;
+
+    /*
+     * Compression level. (EBZIP compression only)
+     */
+    int zip_level;
+
+    /*
+     * Length of an index. (EBZIP compression only)
+     */
+    int index_width;
+
+    /*
+     * Adler-32 check sum of an uncompressed file. (EBZIP compression only)
+     */
+    unsigned int crc;
+
+    /*
+     * mtime of an uncompressed file. (EBZIP compression only)
+     */
+    time_t mtime;
+
+    /*
+     * Location of an index table. (EPWING and S-EBXA compression only)
+     */
+    off_t index_location;
+
+    /*
+     * Length of an index table. (EPWING and S-EBXA compression only)
+     */
+    size_t index_length;
+
+    /*
+     * Location of a frequency table. (EPWING compression only)
+     */
+    off_t frequencies_location;
+
+    /*
+     * Length of a frequency table. (EPWING compression only)
+     */
+    size_t frequencies_length;
+
+    /*
+     * Huffman tree nodes. (EPWING compression only)
+     */
+    Zio_Huffman_Node *huffman_nodes;
+
+    /*
+     * Root node of a Huffman tree. (EPWING compression only)
+     */
+    Zio_Huffman_Node *huffman_root;
+
+    /*
+     * Region of compressed pages. (S-EBXA compression only)
+     */
+    off_t zio_start_location;
+    off_t zio_end_location;
+
+    /*
+     * Add this value to offset written in index. (S-EBXA compression only)
+     */
+    off_t index_base;
+
+    /*
+     * ebnet mode flag.
+     */
+    int is_ebnet;
+};
+
+/*
+ * Function declarations.
+ */
+/* zio.c */
+int zio_initialize_library(void);
+void zio_finalize_library(void);
+void zio_initialize(Zio *zio);
+void zio_finalize(Zio *zio);
+int zio_set_sebxa_mode(Zio *zio, off_t index_location, off_t index_base,
+    off_t zio_start_location, off_t zio_end_location);
+int zio_open(Zio *zio, const char *file_name, Zio_Code zio_code);
+void zio_close(Zio *zio);
+int zio_file(Zio *zio);
+Zio_Code zio_mode(Zio *zio);
+off_t zio_lseek(Zio *zio, off_t offset, int whence);
+ssize_t zio_read(Zio *zio, char *buffer, size_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* not ZIO_H */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/tiff/tiffconf.h goldendict-1.5.0~git20150923/winlibs/include/tiff/tiffconf.h
--- goldendict-1.5.0~git20131003/winlibs/include/tiff/tiffconf.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/tiff/tiffconf.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,128 @@
+/* libtiff/tiffconf.h.  Generated from tiffconf.h.in by configure.  */
+/*
+  Configuration defines for installed libtiff.
+  This file maintained for backward compatibility. Do not use definitions
+  from this file in your programs.
+*/
+
+#ifndef _TIFFCONF_
+#define _TIFFCONF_
+
+/* Signed 16-bit type */
+#define TIFF_INT16_T signed short
+
+/* Signed 32-bit type */
+#define TIFF_INT32_T signed int
+
+/* Signed 64-bit type */
+#define TIFF_INT64_T signed long long
+
+/* Signed 8-bit type */
+#define TIFF_INT8_T signed char
+
+/* Unsigned 16-bit type */
+#define TIFF_UINT16_T unsigned short
+
+/* Unsigned 32-bit type */
+#define TIFF_UINT32_T unsigned int
+
+/* Unsigned 64-bit type */
+#define TIFF_UINT64_T unsigned long long
+
+/* Unsigned 8-bit type */
+#define TIFF_UINT8_T unsigned char
+
+/* Signed size type */
+#define TIFF_SSIZE_T signed long
+
+/* Pointer difference type */
+#define TIFF_PTRDIFF_T ptrdiff_t
+
+/* Define to 1 if the system has the type `int16'. */
+/* #undef HAVE_INT16 */
+
+/* Define to 1 if the system has the type `int32'. */
+/* #undef HAVE_INT32 */
+
+/* Define to 1 if the system has the type `int8'. */
+/* #undef HAVE_INT8 */
+
+/* Compatibility stuff. */
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+   (Intel) */
+#define HOST_BIGENDIAN 0
+
+/* Support CCITT Group 3 & 4 algorithms */
+#define CCITT_SUPPORT 1
+
+/* Support JPEG compression (requires IJG JPEG library) */
+/* #undef JPEG_SUPPORT */
+
+/* Support JBIG compression (requires JBIG-KIT library) */
+/* #undef JBIG_SUPPORT */
+
+/* Support LogLuv high dynamic range encoding */
+#define LOGLUV_SUPPORT 1
+
+/* Support LZW algorithm */
+#define LZW_SUPPORT 1
+
+/* Support NeXT 2-bit RLE algorithm */
+#define NEXT_SUPPORT 1
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+   fails with unpatched IJG JPEG library) */
+/* #undef OJPEG_SUPPORT */
+
+/* Support Macintosh PackBits algorithm */
+#define PACKBITS_SUPPORT 1
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+#define PIXARLOG_SUPPORT 1
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#define THUNDER_SUPPORT 1
+
+/* Support Deflate compression */
+#define ZIP_SUPPORT 1
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+   images to mutiple strips of ~8Kb to reduce memory usage) */
+#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
+
+/* Enable SubIFD tag (330) support */
+#define SUBIFD_SUPPORT 1
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+   packages produce RGBA files but don't mark the alpha properly. */
+#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
+
+/* Support MS MDI magic number files as TIFF */
+#define MDI_SUPPORT 1
+
+/*
+ * Feature support definitions.
+ * XXX: These macros are obsoleted. Don't use them in your apps!
+ * Macros stays here for backward compatibility and should be always defined.
+ */
+#define COLORIMETRY_SUPPORT
+#define YCBCR_SUPPORT
+#define CMYK_SUPPORT
+#define ICC_SUPPORT
+#define PHOTOSHOP_SUPPORT
+#define IPTC_SUPPORT
+
+#endif /* _TIFFCONF_ */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/tiff/tiff.h goldendict-1.5.0~git20150923/winlibs/include/tiff/tiff.h
--- goldendict-1.5.0~git20131003/winlibs/include/tiff/tiff.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/tiff/tiff.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,678 @@
+/* $Id: tiff.h,v 1.68 2012-08-19 16:56:35 bfriesen Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFF_
+#define	_TIFF_
+
+#include "tiffconf.h"
+
+/*
+ * Tag Image File Format (TIFF)
+ *
+ * Based on Rev 6.0 from:
+ *    Developer's Desk
+ *    Aldus Corporation
+ *    411 First Ave. South
+ *    Suite 200
+ *    Seattle, WA  98104
+ *    206-622-5500
+ *
+ *    (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
+ *
+ * For BigTIFF design notes see the following links
+ *    http://www.remotesensing.org/libtiff/bigtiffdesign.html
+ *    http://www.awaresystems.be/imaging/tiff/bigtiff.html
+ */
+
+#define TIFF_VERSION_CLASSIC 42
+#define TIFF_VERSION_BIG 43
+
+#define TIFF_BIGENDIAN      0x4d4d
+#define TIFF_LITTLEENDIAN   0x4949
+#define MDI_LITTLEENDIAN    0x5045
+#define MDI_BIGENDIAN       0x4550
+
+/*
+ * Intrinsic data types required by the file format:
+ *
+ * 8-bit quantities     int8/uint8
+ * 16-bit quantities    int16/uint16
+ * 32-bit quantities    int32/uint32
+ * 64-bit quantities    int64/uint64
+ * strings              unsigned char*
+ */
+
+typedef TIFF_INT8_T   int8;
+typedef TIFF_UINT8_T  uint8;
+
+typedef TIFF_INT16_T  int16;
+typedef TIFF_UINT16_T uint16;
+
+typedef TIFF_INT32_T  int32;
+typedef TIFF_UINT32_T uint32;
+
+typedef TIFF_INT64_T  int64;
+typedef TIFF_UINT64_T uint64;
+
+/*
+ * Some types as promoted in a variable argument list
+ * We use uint16_vap rather then directly using int, because this way
+ * we document the type we actually want to pass through, conceptually,
+ * rather then confusing the issue by merely stating the type it gets
+ * promoted to
+ */
+
+typedef int uint16_vap;
+
+/*
+ * TIFF header.
+ */
+typedef struct {
+	uint16 tiff_magic;      /* magic number (defines byte order) */
+	uint16 tiff_version;    /* TIFF version number */
+} TIFFHeaderCommon;
+typedef struct {
+	uint16 tiff_magic;      /* magic number (defines byte order) */
+	uint16 tiff_version;    /* TIFF version number */
+	uint32 tiff_diroff;     /* byte offset to first directory */
+} TIFFHeaderClassic;
+typedef struct {
+	uint16 tiff_magic;      /* magic number (defines byte order) */
+	uint16 tiff_version;    /* TIFF version number */
+	uint16 tiff_offsetsize; /* size of offsets, should be 8 */
+	uint16 tiff_unused;     /* unused word, should be 0 */
+	uint64 tiff_diroff;     /* byte offset to first directory */
+} TIFFHeaderBig;
+
+
+/*
+ * NB: In the comments below,
+ *  - items marked with a + are obsoleted by revision 5.0,
+ *  - items marked with a ! are introduced in revision 6.0.
+ *  - items marked with a % are introduced post revision 6.0.
+ *  - items marked with a $ are obsoleted by revision 6.0.
+ *  - items marked with a & are introduced by Adobe DNG specification.
+ */
+
+/*
+ * Tag data type information.
+ *
+ * Note: RATIONALs are the ratio of two 32-bit integer values.
+ */
+typedef enum {
+	TIFF_NOTYPE = 0,      /* placeholder */
+	TIFF_BYTE = 1,        /* 8-bit unsigned integer */
+	TIFF_ASCII = 2,       /* 8-bit bytes w/ last byte null */
+	TIFF_SHORT = 3,       /* 16-bit unsigned integer */
+	TIFF_LONG = 4,        /* 32-bit unsigned integer */
+	TIFF_RATIONAL = 5,    /* 64-bit unsigned fraction */
+	TIFF_SBYTE = 6,       /* !8-bit signed integer */
+	TIFF_UNDEFINED = 7,   /* !8-bit untyped data */
+	TIFF_SSHORT = 8,      /* !16-bit signed integer */
+	TIFF_SLONG = 9,       /* !32-bit signed integer */
+	TIFF_SRATIONAL = 10,  /* !64-bit signed fraction */
+	TIFF_FLOAT = 11,      /* !32-bit IEEE floating point */
+	TIFF_DOUBLE = 12,     /* !64-bit IEEE floating point */
+	TIFF_IFD = 13,        /* %32-bit unsigned integer (offset) */
+	TIFF_LONG8 = 16,      /* BigTIFF 64-bit unsigned integer */
+	TIFF_SLONG8 = 17,     /* BigTIFF 64-bit signed integer */
+	TIFF_IFD8 = 18        /* BigTIFF 64-bit unsigned integer (offset) */
+} TIFFDataType;
+
+/*
+ * TIFF Tag Definitions.
+ */
+#define	TIFFTAG_SUBFILETYPE		254	/* subfile data descriptor */
+#define	    FILETYPE_REDUCEDIMAGE	0x1	/* reduced resolution version */
+#define	    FILETYPE_PAGE		0x2	/* one page of many */
+#define	    FILETYPE_MASK		0x4	/* transparency mask */
+#define	TIFFTAG_OSUBFILETYPE		255	/* +kind of data in subfile */
+#define	    OFILETYPE_IMAGE		1	/* full resolution image data */
+#define	    OFILETYPE_REDUCEDIMAGE	2	/* reduced size image data */
+#define	    OFILETYPE_PAGE		3	/* one page of many */
+#define	TIFFTAG_IMAGEWIDTH		256	/* image width in pixels */
+#define	TIFFTAG_IMAGELENGTH		257	/* image height in pixels */
+#define	TIFFTAG_BITSPERSAMPLE		258	/* bits per channel (sample) */
+#define	TIFFTAG_COMPRESSION		259	/* data compression technique */
+#define	    COMPRESSION_NONE		1	/* dump mode */
+#define	    COMPRESSION_CCITTRLE	2	/* CCITT modified Huffman RLE */
+#define	    COMPRESSION_CCITTFAX3	3	/* CCITT Group 3 fax encoding */
+#define     COMPRESSION_CCITT_T4        3       /* CCITT T.4 (TIFF 6 name) */
+#define	    COMPRESSION_CCITTFAX4	4	/* CCITT Group 4 fax encoding */
+#define     COMPRESSION_CCITT_T6        4       /* CCITT T.6 (TIFF 6 name) */
+#define	    COMPRESSION_LZW		5       /* Lempel-Ziv  & Welch */
+#define	    COMPRESSION_OJPEG		6	/* !6.0 JPEG */
+#define	    COMPRESSION_JPEG		7	/* %JPEG DCT compression */
+#define     COMPRESSION_T85			9	/* !TIFF/FX T.85 JBIG compression */
+#define     COMPRESSION_T43			10	/* !TIFF/FX T.43 colour by layered JBIG compression */
+#define	    COMPRESSION_NEXT		32766	/* NeXT 2-bit RLE */
+#define	    COMPRESSION_CCITTRLEW	32771	/* #1 w/ word alignment */
+#define	    COMPRESSION_PACKBITS	32773	/* Macintosh RLE */
+#define	    COMPRESSION_THUNDERSCAN	32809	/* ThunderScan RLE */
+/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
+#define	    COMPRESSION_IT8CTPAD	32895   /* IT8 CT w/padding */
+#define	    COMPRESSION_IT8LW		32896   /* IT8 Linework RLE */
+#define	    COMPRESSION_IT8MP		32897   /* IT8 Monochrome picture */
+#define	    COMPRESSION_IT8BL		32898   /* IT8 Binary line art */
+/* compression codes 32908-32911 are reserved for Pixar */
+#define     COMPRESSION_PIXARFILM	32908   /* Pixar companded 10bit LZW */
+#define	    COMPRESSION_PIXARLOG	32909   /* Pixar companded 11bit ZIP */
+#define	    COMPRESSION_DEFLATE		32946	/* Deflate compression */
+#define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression,
+						   as recognized by Adobe */
+/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
+#define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
+#define	    COMPRESSION_JBIG		34661	/* ISO JBIG */
+#define     COMPRESSION_SGILOG		34676	/* SGI Log Luminance RLE */
+#define     COMPRESSION_SGILOG24	34677	/* SGI Log 24-bit packed */
+#define     COMPRESSION_JP2000          34712   /* Leadtools JPEG2000 */
+#define	    COMPRESSION_LZMA		34925	/* LZMA2 */
+#define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
+#define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
+#define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */
+#define	    PHOTOMETRIC_RGB		2	/* RGB color model */
+#define	    PHOTOMETRIC_PALETTE		3	/* color map indexed */
+#define	    PHOTOMETRIC_MASK		4	/* $holdout mask */
+#define	    PHOTOMETRIC_SEPARATED	5	/* !color separations */
+#define	    PHOTOMETRIC_YCBCR		6	/* !CCIR 601 */
+#define	    PHOTOMETRIC_CIELAB		8	/* !1976 CIE L*a*b* */
+#define	    PHOTOMETRIC_ICCLAB		9	/* ICC L*a*b* [Adobe TIFF Technote 4] */
+#define	    PHOTOMETRIC_ITULAB		10	/* ITU L*a*b* */
+#define     PHOTOMETRIC_LOGL		32844	/* CIE Log2(L) */
+#define     PHOTOMETRIC_LOGLUV		32845	/* CIE Log2(L) (u',v') */
+#define	TIFFTAG_THRESHHOLDING		263	/* +thresholding used on data */
+#define	    THRESHHOLD_BILEVEL		1	/* b&w art scan */
+#define	    THRESHHOLD_HALFTONE		2	/* or dithered scan */
+#define	    THRESHHOLD_ERRORDIFFUSE	3	/* usually floyd-steinberg */
+#define	TIFFTAG_CELLWIDTH		264	/* +dithering matrix width */
+#define	TIFFTAG_CELLLENGTH		265	/* +dithering matrix height */
+#define	TIFFTAG_FILLORDER		266	/* data order within a byte */
+#define	    FILLORDER_MSB2LSB		1	/* most significant -> least */
+#define	    FILLORDER_LSB2MSB		2	/* least significant -> most */
+#define	TIFFTAG_DOCUMENTNAME		269	/* name of doc. image is from */
+#define	TIFFTAG_IMAGEDESCRIPTION	270	/* info about image */
+#define	TIFFTAG_MAKE			271	/* scanner manufacturer name */
+#define	TIFFTAG_MODEL			272	/* scanner model name/number */
+#define	TIFFTAG_STRIPOFFSETS		273	/* offsets to data strips */
+#define	TIFFTAG_ORIENTATION		274	/* +image orientation */
+#define	    ORIENTATION_TOPLEFT		1	/* row 0 top, col 0 lhs */
+#define	    ORIENTATION_TOPRIGHT	2	/* row 0 top, col 0 rhs */
+#define	    ORIENTATION_BOTRIGHT	3	/* row 0 bottom, col 0 rhs */
+#define	    ORIENTATION_BOTLEFT		4	/* row 0 bottom, col 0 lhs */
+#define	    ORIENTATION_LEFTTOP		5	/* row 0 lhs, col 0 top */
+#define	    ORIENTATION_RIGHTTOP	6	/* row 0 rhs, col 0 top */
+#define	    ORIENTATION_RIGHTBOT	7	/* row 0 rhs, col 0 bottom */
+#define	    ORIENTATION_LEFTBOT		8	/* row 0 lhs, col 0 bottom */
+#define	TIFFTAG_SAMPLESPERPIXEL		277	/* samples per pixel */
+#define	TIFFTAG_ROWSPERSTRIP		278	/* rows per strip of data */
+#define	TIFFTAG_STRIPBYTECOUNTS		279	/* bytes counts for strips */
+#define	TIFFTAG_MINSAMPLEVALUE		280	/* +minimum sample value */
+#define	TIFFTAG_MAXSAMPLEVALUE		281	/* +maximum sample value */
+#define	TIFFTAG_XRESOLUTION		282	/* pixels/resolution in x */
+#define	TIFFTAG_YRESOLUTION		283	/* pixels/resolution in y */
+#define	TIFFTAG_PLANARCONFIG		284	/* storage organization */
+#define	    PLANARCONFIG_CONTIG		1	/* single image plane */
+#define	    PLANARCONFIG_SEPARATE	2	/* separate planes of data */
+#define	TIFFTAG_PAGENAME		285	/* page name image is from */
+#define	TIFFTAG_XPOSITION		286	/* x page offset of image lhs */
+#define	TIFFTAG_YPOSITION		287	/* y page offset of image lhs */
+#define	TIFFTAG_FREEOFFSETS		288	/* +byte offset to free block */
+#define	TIFFTAG_FREEBYTECOUNTS		289	/* +sizes of free blocks */
+#define	TIFFTAG_GRAYRESPONSEUNIT	290	/* $gray scale curve accuracy */
+#define	    GRAYRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    GRAYRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    GRAYRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_GRAYRESPONSECURVE	291	/* $gray scale response curve */
+#define	TIFFTAG_GROUP3OPTIONS		292	/* 32 flag bits */
+#define	TIFFTAG_T4OPTIONS		292	/* TIFF 6.0 proper name alias */
+#define	    GROUP3OPT_2DENCODING	0x1	/* 2-dimensional coding */
+#define	    GROUP3OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	    GROUP3OPT_FILLBITS		0x4	/* fill to byte boundary */
+#define	TIFFTAG_GROUP4OPTIONS		293	/* 32 flag bits */
+#define TIFFTAG_T6OPTIONS               293     /* TIFF 6.0 proper name */
+#define	    GROUP4OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	TIFFTAG_RESOLUTIONUNIT		296	/* units of resolutions */
+#define	    RESUNIT_NONE		1	/* no meaningful units */
+#define	    RESUNIT_INCH		2	/* english */
+#define	    RESUNIT_CENTIMETER		3	/* metric */
+#define	TIFFTAG_PAGENUMBER		297	/* page numbers of multi-page */
+#define	TIFFTAG_COLORRESPONSEUNIT	300	/* $color curve accuracy */
+#define	    COLORRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    COLORRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    COLORRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    COLORRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    COLORRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_TRANSFERFUNCTION	301	/* !colorimetry info */
+#define	TIFFTAG_SOFTWARE		305	/* name & release */
+#define	TIFFTAG_DATETIME		306	/* creation date and time */
+#define	TIFFTAG_ARTIST			315	/* creator of image */
+#define	TIFFTAG_HOSTCOMPUTER		316	/* machine where created */
+#define	TIFFTAG_PREDICTOR		317	/* prediction scheme w/ LZW */
+#define     PREDICTOR_NONE		1	/* no prediction scheme used */
+#define     PREDICTOR_HORIZONTAL	2	/* horizontal differencing */
+#define     PREDICTOR_FLOATINGPOINT	3	/* floating point predictor */
+#define	TIFFTAG_WHITEPOINT		318	/* image white point */
+#define	TIFFTAG_PRIMARYCHROMATICITIES	319	/* !primary chromaticities */
+#define	TIFFTAG_COLORMAP		320	/* RGB map for pallette image */
+#define	TIFFTAG_HALFTONEHINTS		321	/* !highlight+shadow info */
+#define	TIFFTAG_TILEWIDTH		322	/* !tile width in pixels */
+#define	TIFFTAG_TILELENGTH		323	/* !tile height in pixels */
+#define TIFFTAG_TILEOFFSETS		324	/* !offsets to data tiles */
+#define TIFFTAG_TILEBYTECOUNTS		325	/* !byte counts for tiles */
+#define	TIFFTAG_BADFAXLINES		326	/* lines w/ wrong pixel count */
+#define	TIFFTAG_CLEANFAXDATA		327	/* regenerated line info */
+#define	    CLEANFAXDATA_CLEAN		0	/* no errors detected */
+#define	    CLEANFAXDATA_REGENERATED	1	/* receiver regenerated lines */
+#define	    CLEANFAXDATA_UNCLEAN	2	/* uncorrected errors exist */
+#define	TIFFTAG_CONSECUTIVEBADFAXLINES	328	/* max consecutive bad lines */
+#define	TIFFTAG_SUBIFD			330	/* subimage descriptors */
+#define	TIFFTAG_INKSET			332	/* !inks in separated image */
+#define	    INKSET_CMYK			1	/* !cyan-magenta-yellow-black color */
+#define	    INKSET_MULTIINK		2	/* !multi-ink or hi-fi color */
+#define	TIFFTAG_INKNAMES		333	/* !ascii names of inks */
+#define	TIFFTAG_NUMBEROFINKS		334	/* !number of inks */
+#define	TIFFTAG_DOTRANGE		336	/* !0% and 100% dot codes */
+#define	TIFFTAG_TARGETPRINTER		337	/* !separation target */
+#define	TIFFTAG_EXTRASAMPLES		338	/* !info about extra samples */
+#define	    EXTRASAMPLE_UNSPECIFIED	0	/* !unspecified data */
+#define	    EXTRASAMPLE_ASSOCALPHA	1	/* !associated alpha data */
+#define	    EXTRASAMPLE_UNASSALPHA	2	/* !unassociated alpha data */
+#define	TIFFTAG_SAMPLEFORMAT		339	/* !data sample format */
+#define	    SAMPLEFORMAT_UINT		1	/* !unsigned integer data */
+#define	    SAMPLEFORMAT_INT		2	/* !signed integer data */
+#define	    SAMPLEFORMAT_IEEEFP		3	/* !IEEE floating point data */
+#define	    SAMPLEFORMAT_VOID		4	/* !untyped data */
+#define	    SAMPLEFORMAT_COMPLEXINT	5	/* !complex signed int */
+#define	    SAMPLEFORMAT_COMPLEXIEEEFP	6	/* !complex ieee floating */
+#define	TIFFTAG_SMINSAMPLEVALUE		340	/* !variable MinSampleValue */
+#define	TIFFTAG_SMAXSAMPLEVALUE		341	/* !variable MaxSampleValue */
+#define	TIFFTAG_CLIPPATH		343	/* %ClipPath
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_XCLIPPATHUNITS		344	/* %XClipPathUnits
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_YCLIPPATHUNITS		345	/* %YClipPathUnits
+						   [Adobe TIFF technote 2] */
+#define	TIFFTAG_INDEXED			346	/* %Indexed
+						   [Adobe TIFF Technote 3] */
+#define	TIFFTAG_JPEGTABLES		347	/* %JPEG table stream */
+#define	TIFFTAG_OPIPROXY		351	/* %OPI Proxy [Adobe TIFF technote] */
+/* Tags 400-435 are from the TIFF/FX spec */
+#define TIFFTAG_GLOBALPARAMETERSIFD	400	/* ! */
+#define TIFFTAG_PROFILETYPE			401	/* ! */
+#define     PROFILETYPE_UNSPECIFIED	0	/* ! */
+#define     PROFILETYPE_G3_FAX		1	/* ! */
+#define TIFFTAG_FAXPROFILE			402	/* ! */
+#define     FAXPROFILE_S			1	/* !TIFF/FX FAX profile S */
+#define     FAXPROFILE_F			2	/* !TIFF/FX FAX profile F */
+#define     FAXPROFILE_J			3	/* !TIFF/FX FAX profile J */
+#define     FAXPROFILE_C			4	/* !TIFF/FX FAX profile C */
+#define     FAXPROFILE_L			5	/* !TIFF/FX FAX profile L */
+#define     FAXPROFILE_M			6	/* !TIFF/FX FAX profile LM */
+#define TIFFTAG_CODINGMETHODS		403	/* !TIFF/FX coding methods */
+#define     CODINGMETHODS_T4_1D		(1 << 1)	/* !T.4 1D */
+#define     CODINGMETHODS_T4_2D		(1 << 2)	/* !T.4 2D */
+#define     CODINGMETHODS_T6		(1 << 3)	/* !T.6 */
+#define     CODINGMETHODS_T85 		(1 << 4)	/* !T.85 JBIG */
+#define     CODINGMETHODS_T42 		(1 << 5)	/* !T.42 JPEG */
+#define     CODINGMETHODS_T43		(1 << 6)	/* !T.43 colour by layered JBIG */
+#define TIFFTAG_VERSIONYEAR			404	/* !TIFF/FX version year */
+#define TIFFTAG_MODENUMBER			405	/* !TIFF/FX mode number */
+#define TIFFTAG_DECODE				433	/* !TIFF/FX decode */
+#define TIFFTAG_IMAGEBASECOLOR		434	/* !TIFF/FX image base colour */
+#define TIFFTAG_T82OPTIONS			435	/* !TIFF/FX T.82 options */
+/*
+ * Tags 512-521 are obsoleted by Technical Note #2 which specifies a
+ * revised JPEG-in-TIFF scheme.
+ */
+#define	TIFFTAG_JPEGPROC		512	/* !JPEG processing algorithm */
+#define	    JPEGPROC_BASELINE		1	/* !baseline sequential */
+#define	    JPEGPROC_LOSSLESS		14	/* !Huffman coded lossless */
+#define	TIFFTAG_JPEGIFOFFSET		513	/* !pointer to SOI marker */
+#define	TIFFTAG_JPEGIFBYTECOUNT		514	/* !JFIF stream length */
+#define	TIFFTAG_JPEGRESTARTINTERVAL	515	/* !restart interval length */
+#define	TIFFTAG_JPEGLOSSLESSPREDICTORS	517	/* !lossless proc predictor */
+#define	TIFFTAG_JPEGPOINTTRANSFORM	518	/* !lossless point transform */
+#define	TIFFTAG_JPEGQTABLES		519	/* !Q matrice offsets */
+#define	TIFFTAG_JPEGDCTABLES		520	/* !DCT table offsets */
+#define	TIFFTAG_JPEGACTABLES		521	/* !AC coefficient offsets */
+#define	TIFFTAG_YCBCRCOEFFICIENTS	529	/* !RGB -> YCbCr transform */
+#define	TIFFTAG_YCBCRSUBSAMPLING	530	/* !YCbCr subsampling factors */
+#define	TIFFTAG_YCBCRPOSITIONING	531	/* !subsample positioning */
+#define	    YCBCRPOSITION_CENTERED	1	/* !as in PostScript Level 2 */
+#define	    YCBCRPOSITION_COSITED	2	/* !as in CCIR 601-1 */
+#define	TIFFTAG_REFERENCEBLACKWHITE	532	/* !colorimetry info */
+#define TIFFTAG_STRIPROWCOUNTS		559 /* !TIFF/FX strip row counts */
+#define	TIFFTAG_XMLPACKET		700	/* %XML packet
+						   [Adobe XMP Specification,
+						   January 2004 */
+#define TIFFTAG_OPIIMAGEID		32781	/* %OPI ImageID
+						   [Adobe TIFF technote] */
+/* tags 32952-32956 are private tags registered to Island Graphics */
+#define TIFFTAG_REFPTS			32953	/* image reference points */
+#define TIFFTAG_REGIONTACKPOINT		32954	/* region-xform tack point */
+#define TIFFTAG_REGIONWARPCORNERS	32955	/* warp quadrilateral */
+#define TIFFTAG_REGIONAFFINE		32956	/* affine transformation mat */
+/* tags 32995-32999 are private tags registered to SGI */
+#define	TIFFTAG_MATTEING		32995	/* $use ExtraSamples */
+#define	TIFFTAG_DATATYPE		32996	/* $use SampleFormat */
+#define	TIFFTAG_IMAGEDEPTH		32997	/* z depth of image */
+#define	TIFFTAG_TILEDEPTH		32998	/* z depth/data tile */
+/* tags 33300-33309 are private tags registered to Pixar */
+/*
+ * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
+ * are set when an image has been cropped out of a larger image.  
+ * They reflect the size of the original uncropped image.
+ * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used
+ * to determine the position of the smaller image in the larger one.
+ */
+#define TIFFTAG_PIXAR_IMAGEFULLWIDTH    33300   /* full image size in x */
+#define TIFFTAG_PIXAR_IMAGEFULLLENGTH   33301   /* full image size in y */
+ /* Tags 33302-33306 are used to identify special image modes and data
+  * used by Pixar's texture formats.
+  */
+#define TIFFTAG_PIXAR_TEXTUREFORMAT	33302	/* texture map format */
+#define TIFFTAG_PIXAR_WRAPMODES		33303	/* s & t wrap modes */
+#define TIFFTAG_PIXAR_FOVCOT		33304	/* cotan(fov) for env. maps */
+#define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
+#define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
+/* tag 33405 is a private tag registered to Eastman Kodak */
+#define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
+/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
+#define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+/* IPTC TAG from RichTIFF specifications */
+#define TIFFTAG_RICHTIFFIPTC		33723
+/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
+#define TIFFTAG_IT8SITE			34016	/* site name */
+#define TIFFTAG_IT8COLORSEQUENCE	34017	/* color seq. [RGB,CMYK,etc] */
+#define TIFFTAG_IT8HEADER		34018	/* DDES Header */
+#define TIFFTAG_IT8RASTERPADDING	34019	/* raster scanline padding */
+#define TIFFTAG_IT8BITSPERRUNLENGTH	34020	/* # of bits in short run */
+#define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */
+#define TIFFTAG_IT8COLORTABLE		34022	/* LW colortable */
+#define TIFFTAG_IT8IMAGECOLORINDICATOR	34023	/* BP/BL image color switch */
+#define TIFFTAG_IT8BKGCOLORINDICATOR	34024	/* BP/BL bg color switch */
+#define TIFFTAG_IT8IMAGECOLORVALUE	34025	/* BP/BL image color value */
+#define TIFFTAG_IT8BKGCOLORVALUE	34026	/* BP/BL bg color value */
+#define TIFFTAG_IT8PIXELINTENSITYRANGE	34027	/* MP pixel intensity value */
+#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028	/* HC transparency switch */
+#define TIFFTAG_IT8COLORCHARACTERIZATION 34029	/* color character. table */
+#define TIFFTAG_IT8HCUSAGE		34030	/* HC usage indicator */
+#define TIFFTAG_IT8TRAPINDICATOR	34031	/* Trapping indicator
+						   (untrapped=0, trapped=1) */
+#define TIFFTAG_IT8CMYKEQUIVALENT	34032	/* CMYK color equivalents */
+/* tags 34232-34236 are private tags registered to Texas Instruments */
+#define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
+/* tag 34377 is private tag registered to Adobe for PhotoShop */
+#define TIFFTAG_PHOTOSHOP		34377 
+/* tags 34665, 34853 and 40965 are documented in EXIF specification */
+#define TIFFTAG_EXIFIFD			34665	/* Pointer to EXIF private directory */
+/* tag 34750 is a private tag registered to Adobe? */
+#define TIFFTAG_ICCPROFILE		34675	/* ICC profile data */
+#define TIFFTAG_IMAGELAYER		34732	/* !TIFF/FX image layer information */
+/* tag 34750 is a private tag registered to Pixel Magic */
+#define	TIFFTAG_JBIGOPTIONS		34750	/* JBIG options */
+#define TIFFTAG_GPSIFD			34853	/* Pointer to GPS private directory */
+/* tags 34908-34914 are private tags registered to SGI */
+#define	TIFFTAG_FAXRECVPARAMS		34908	/* encoded Class 2 ses. parms */
+#define	TIFFTAG_FAXSUBADDRESS		34909	/* received SubAddr string */
+#define	TIFFTAG_FAXRECVTIME		34910	/* receive time (secs) */
+#define	TIFFTAG_FAXDCS			34911	/* encoded fax ses. params, Table 2/T.30 */
+/* tags 37439-37443 are registered to SGI <gregl@sgi.com> */
+#define TIFFTAG_STONITS			37439	/* Sample value to Nits */
+/* tag 34929 is a private tag registered to FedEx */
+#define	TIFFTAG_FEDEX_EDR		34929	/* unknown use */
+#define TIFFTAG_INTEROPERABILITYIFD	40965	/* Pointer to Interoperability private directory */
+/* Adobe Digital Negative (DNG) format tags */
+#define TIFFTAG_DNGVERSION		50706	/* &DNG version number */
+#define TIFFTAG_DNGBACKWARDVERSION	50707	/* &DNG compatibility version */
+#define TIFFTAG_UNIQUECAMERAMODEL	50708	/* &name for the camera model */
+#define TIFFTAG_LOCALIZEDCAMERAMODEL	50709	/* &localized camera model
+						   name */
+#define TIFFTAG_CFAPLANECOLOR		50710	/* &CFAPattern->LinearRaw space
+						   mapping */
+#define TIFFTAG_CFALAYOUT		50711	/* &spatial layout of the CFA */
+#define TIFFTAG_LINEARIZATIONTABLE	50712	/* &lookup table description */
+#define TIFFTAG_BLACKLEVELREPEATDIM	50713	/* &repeat pattern size for
+						   the BlackLevel tag */
+#define TIFFTAG_BLACKLEVEL		50714	/* &zero light encoding level */
+#define TIFFTAG_BLACKLEVELDELTAH	50715	/* &zero light encoding level
+						   differences (columns) */
+#define TIFFTAG_BLACKLEVELDELTAV	50716	/* &zero light encoding level
+						   differences (rows) */
+#define TIFFTAG_WHITELEVEL		50717	/* &fully saturated encoding
+						   level */
+#define TIFFTAG_DEFAULTSCALE		50718	/* &default scale factors */
+#define TIFFTAG_DEFAULTCROPORIGIN	50719	/* &origin of the final image
+						   area */
+#define TIFFTAG_DEFAULTCROPSIZE		50720	/* &size of the final image 
+						   area */
+#define TIFFTAG_COLORMATRIX1		50721	/* &XYZ->reference color space
+						   transformation matrix 1 */
+#define TIFFTAG_COLORMATRIX2		50722	/* &XYZ->reference color space
+						   transformation matrix 2 */
+#define TIFFTAG_CAMERACALIBRATION1	50723	/* &calibration matrix 1 */
+#define TIFFTAG_CAMERACALIBRATION2	50724	/* &calibration matrix 2 */
+#define TIFFTAG_REDUCTIONMATRIX1	50725	/* &dimensionality reduction
+						   matrix 1 */
+#define TIFFTAG_REDUCTIONMATRIX2	50726	/* &dimensionality reduction
+						   matrix 2 */
+#define TIFFTAG_ANALOGBALANCE		50727	/* &gain applied the stored raw
+						   values*/
+#define TIFFTAG_ASSHOTNEUTRAL		50728	/* &selected white balance in
+						   linear reference space */
+#define TIFFTAG_ASSHOTWHITEXY		50729	/* &selected white balance in
+						   x-y chromaticity
+						   coordinates */
+#define TIFFTAG_BASELINEEXPOSURE	50730	/* &how much to move the zero
+						   point */
+#define TIFFTAG_BASELINENOISE		50731	/* &relative noise level */
+#define TIFFTAG_BASELINESHARPNESS	50732	/* &relative amount of
+						   sharpening */
+#define TIFFTAG_BAYERGREENSPLIT		50733	/* &how closely the values of
+						   the green pixels in the
+						   blue/green rows track the
+						   values of the green pixels
+						   in the red/green rows */
+#define TIFFTAG_LINEARRESPONSELIMIT	50734	/* &non-linear encoding range */
+#define TIFFTAG_CAMERASERIALNUMBER	50735	/* &camera's serial number */
+#define TIFFTAG_LENSINFO		50736	/* info about the lens */
+#define TIFFTAG_CHROMABLURRADIUS	50737	/* &chroma blur radius */
+#define TIFFTAG_ANTIALIASSTRENGTH	50738	/* &relative strength of the
+						   camera's anti-alias filter */
+#define TIFFTAG_SHADOWSCALE		50739	/* &used by Adobe Camera Raw */
+#define TIFFTAG_DNGPRIVATEDATA		50740	/* &manufacturer's private data */
+#define TIFFTAG_MAKERNOTESAFETY		50741	/* &whether the EXIF MakerNote
+						   tag is safe to preserve
+						   along with the rest of the
+						   EXIF data */
+#define	TIFFTAG_CALIBRATIONILLUMINANT1	50778	/* &illuminant 1 */
+#define TIFFTAG_CALIBRATIONILLUMINANT2	50779	/* &illuminant 2 */
+#define TIFFTAG_BESTQUALITYSCALE	50780	/* &best quality multiplier */
+#define TIFFTAG_RAWDATAUNIQUEID		50781	/* &unique identifier for
+						   the raw image data */
+#define TIFFTAG_ORIGINALRAWFILENAME	50827	/* &file name of the original
+						   raw file */
+#define TIFFTAG_ORIGINALRAWFILEDATA	50828	/* &contents of the original
+						   raw file */
+#define TIFFTAG_ACTIVEAREA		50829	/* &active (non-masked) pixels
+						   of the sensor */
+#define TIFFTAG_MASKEDAREAS		50830	/* &list of coordinates
+						   of fully masked pixels */
+#define TIFFTAG_ASSHOTICCPROFILE	50831	/* &these two tags used to */
+#define TIFFTAG_ASSHOTPREPROFILEMATRIX	50832	/* map cameras's color space
+						   into ICC profile space */
+#define TIFFTAG_CURRENTICCPROFILE	50833	/* & */
+#define TIFFTAG_CURRENTPREPROFILEMATRIX	50834	/* & */
+/* tag 65535 is an undefined tag used by Eastman Kodak */
+#define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
+
+/*
+ * The following are ``pseudo tags'' that can be used to control
+ * codec-specific functionality.  These tags are not written to file.
+ * Note that these values start at 0xffff+1 so that they'll never
+ * collide with Aldus-assigned tags.
+ *
+ * If you want your private pseudo tags ``registered'' (i.e. added to
+ * this file), please post a bug report via the tracking system at
+ * http://www.remotesensing.org/libtiff/bugs.html with the appropriate
+ * C definitions to add.
+ */
+#define	TIFFTAG_FAXMODE			65536	/* Group 3/4 format control */
+#define	    FAXMODE_CLASSIC	0x0000		/* default, include RTC */
+#define	    FAXMODE_NORTC	0x0001		/* no RTC at end of data */
+#define	    FAXMODE_NOEOL	0x0002		/* no EOL code at end of row */
+#define	    FAXMODE_BYTEALIGN	0x0004		/* byte align row */
+#define	    FAXMODE_WORDALIGN	0x0008		/* word align row */
+#define	    FAXMODE_CLASSF	FAXMODE_NORTC	/* TIFF Class F */
+#define	TIFFTAG_JPEGQUALITY		65537	/* Compression quality level */
+/* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
+#define	TIFFTAG_JPEGCOLORMODE		65538	/* Auto RGB<=>YCbCr convert? */
+#define	    JPEGCOLORMODE_RAW	0x0000		/* no conversion (default) */
+#define	    JPEGCOLORMODE_RGB	0x0001		/* do auto conversion */
+#define	TIFFTAG_JPEGTABLESMODE		65539	/* What to put in JPEGTables */
+#define	    JPEGTABLESMODE_QUANT 0x0001		/* include quantization tbls */
+#define	    JPEGTABLESMODE_HUFF	0x0002		/* include Huffman tbls */
+/* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
+#define	TIFFTAG_FAXFILLFUNC		65540	/* G3/G4 fill function */
+#define	TIFFTAG_PIXARLOGDATAFMT		65549	/* PixarLogCodec I/O data sz */
+#define	    PIXARLOGDATAFMT_8BIT	0	/* regular u_char samples */
+#define	    PIXARLOGDATAFMT_8BITABGR	1	/* ABGR-order u_chars */
+#define	    PIXARLOGDATAFMT_11BITLOG	2	/* 11-bit log-encoded (raw) */
+#define	    PIXARLOGDATAFMT_12BITPICIO	3	/* as per PICIO (1.0==2048) */
+#define	    PIXARLOGDATAFMT_16BIT	4	/* signed short samples */
+#define	    PIXARLOGDATAFMT_FLOAT	5	/* IEEE float samples */
+/* 65550-65556 are allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
+#define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
+#define     DCSIMAGERMODEL_M5           1       /* M5 chip (1536 x 1024) */
+#define     DCSIMAGERMODEL_M6           2       /* M6 chip (3072 x 2048) */
+#define     DCSIMAGERFILTER_IR          0       /* infrared filter */
+#define     DCSIMAGERFILTER_MONO        1       /* monochrome filter */
+#define     DCSIMAGERFILTER_CFA         2       /* color filter array */
+#define     DCSIMAGERFILTER_OTHER       3       /* other filter */
+#define TIFFTAG_DCSINTERPMODE           65551   /* interpolation mode */
+#define     DCSINTERPMODE_NORMAL        0x0     /* whole image, default */
+#define     DCSINTERPMODE_PREVIEW       0x1     /* preview of image (384x256) */
+#define TIFFTAG_DCSBALANCEARRAY         65552   /* color balance values */
+#define TIFFTAG_DCSCORRECTMATRIX        65553   /* color correction values */
+#define TIFFTAG_DCSGAMMA                65554   /* gamma value */
+#define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
+#define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
+/* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
+#define	TIFFTAG_ZIPQUALITY		65557	/* compression quality level */
+#define	TIFFTAG_PIXARLOGQUALITY		65558	/* PixarLog uses same scale */
+/* 65559 is allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSCLIPRECTANGLE	65559	/* area of image to acquire */
+#define TIFFTAG_SGILOGDATAFMT		65560	/* SGILog user data format */
+#define     SGILOGDATAFMT_FLOAT		0	/* IEEE float samples */
+#define     SGILOGDATAFMT_16BIT		1	/* 16-bit samples */
+#define     SGILOGDATAFMT_RAW		2	/* uninterpreted data */
+#define     SGILOGDATAFMT_8BIT		3	/* 8-bit RGB monitor values */
+#define TIFFTAG_SGILOGENCODE		65561 /* SGILog data encoding control*/
+#define     SGILOGENCODE_NODITHER	0     /* do not dither encoded values*/
+#define     SGILOGENCODE_RANDITHER	1     /* randomly dither encd values */
+#define	TIFFTAG_LZMAPRESET		65562	/* LZMA2 preset (compression level) */
+#define TIFFTAG_PERSAMPLE       65563	/* interface for per sample tags */
+#define     PERSAMPLE_MERGED        0	/* present as a single value */
+#define     PERSAMPLE_MULTI         1	/* present as multiple values */
+
+/*
+ * EXIF tags
+ */
+#define EXIFTAG_EXPOSURETIME		33434	/* Exposure time */
+#define EXIFTAG_FNUMBER			33437	/* F number */
+#define EXIFTAG_EXPOSUREPROGRAM		34850	/* Exposure program */
+#define EXIFTAG_SPECTRALSENSITIVITY	34852	/* Spectral sensitivity */
+#define EXIFTAG_ISOSPEEDRATINGS		34855	/* ISO speed rating */
+#define EXIFTAG_OECF			34856	/* Optoelectric conversion
+						   factor */
+#define EXIFTAG_EXIFVERSION		36864	/* Exif version */
+#define EXIFTAG_DATETIMEORIGINAL	36867	/* Date and time of original
+						   data generation */
+#define EXIFTAG_DATETIMEDIGITIZED	36868	/* Date and time of digital
+						   data generation */
+#define EXIFTAG_COMPONENTSCONFIGURATION	37121	/* Meaning of each component */
+#define EXIFTAG_COMPRESSEDBITSPERPIXEL	37122	/* Image compression mode */
+#define EXIFTAG_SHUTTERSPEEDVALUE	37377	/* Shutter speed */
+#define EXIFTAG_APERTUREVALUE		37378	/* Aperture */
+#define EXIFTAG_BRIGHTNESSVALUE		37379	/* Brightness */
+#define EXIFTAG_EXPOSUREBIASVALUE	37380	/* Exposure bias */
+#define EXIFTAG_MAXAPERTUREVALUE	37381	/* Maximum lens aperture */
+#define EXIFTAG_SUBJECTDISTANCE		37382	/* Subject distance */
+#define EXIFTAG_METERINGMODE		37383	/* Metering mode */
+#define EXIFTAG_LIGHTSOURCE		37384	/* Light source */
+#define EXIFTAG_FLASH			37385	/* Flash */
+#define EXIFTAG_FOCALLENGTH		37386	/* Lens focal length */
+#define EXIFTAG_SUBJECTAREA		37396	/* Subject area */
+#define EXIFTAG_MAKERNOTE		37500	/* Manufacturer notes */
+#define EXIFTAG_USERCOMMENT		37510	/* User comments */
+#define EXIFTAG_SUBSECTIME		37520	/* DateTime subseconds */
+#define EXIFTAG_SUBSECTIMEORIGINAL	37521	/* DateTimeOriginal subseconds */
+#define EXIFTAG_SUBSECTIMEDIGITIZED	37522	/* DateTimeDigitized subseconds */
+#define EXIFTAG_FLASHPIXVERSION		40960	/* Supported Flashpix version */
+#define EXIFTAG_COLORSPACE		40961	/* Color space information */
+#define EXIFTAG_PIXELXDIMENSION		40962	/* Valid image width */
+#define EXIFTAG_PIXELYDIMENSION		40963	/* Valid image height */
+#define EXIFTAG_RELATEDSOUNDFILE	40964	/* Related audio file */
+#define EXIFTAG_FLASHENERGY		41483	/* Flash energy */
+#define EXIFTAG_SPATIALFREQUENCYRESPONSE 41484	/* Spatial frequency response */
+#define EXIFTAG_FOCALPLANEXRESOLUTION	41486	/* Focal plane X resolution */
+#define EXIFTAG_FOCALPLANEYRESOLUTION	41487	/* Focal plane Y resolution */
+#define EXIFTAG_FOCALPLANERESOLUTIONUNIT 41488	/* Focal plane resolution unit */
+#define EXIFTAG_SUBJECTLOCATION		41492	/* Subject location */
+#define EXIFTAG_EXPOSUREINDEX		41493	/* Exposure index */
+#define EXIFTAG_SENSINGMETHOD		41495	/* Sensing method */
+#define EXIFTAG_FILESOURCE		41728	/* File source */
+#define EXIFTAG_SCENETYPE		41729	/* Scene type */
+#define EXIFTAG_CFAPATTERN		41730	/* CFA pattern */
+#define EXIFTAG_CUSTOMRENDERED		41985	/* Custom image processing */
+#define EXIFTAG_EXPOSUREMODE		41986	/* Exposure mode */
+#define EXIFTAG_WHITEBALANCE		41987	/* White balance */
+#define EXIFTAG_DIGITALZOOMRATIO	41988	/* Digital zoom ratio */
+#define EXIFTAG_FOCALLENGTHIN35MMFILM	41989	/* Focal length in 35 mm film */
+#define EXIFTAG_SCENECAPTURETYPE	41990	/* Scene capture type */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_CONTRAST		41992	/* Contrast */
+#define EXIFTAG_SATURATION		41993	/* Saturation */
+#define EXIFTAG_SHARPNESS		41994	/* Sharpness */
+#define EXIFTAG_DEVICESETTINGDESCRIPTION 41995	/* Device settings description */
+#define EXIFTAG_SUBJECTDISTANCERANGE	41996	/* Subject distance range */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_GAINCONTROL		41991	/* Gain control */
+#define EXIFTAG_IMAGEUNIQUEID		42016	/* Unique image ID */
+
+#endif /* _TIFF_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/tiff/tiffio.h goldendict-1.5.0~git20150923/winlibs/include/tiff/tiffio.h
--- goldendict-1.5.0~git20131003/winlibs/include/tiff/tiffio.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/tiff/tiffio.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,557 @@
+/* $Id: tiffio.h,v 1.91 2012-07-29 15:45:29 tgl Exp $ */
+
+/*
+ * Copyright (c) 1988-1997 Sam Leffler
+ * Copyright (c) 1991-1997 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIO_
+#define	_TIFFIO_
+
+/*
+ * TIFF I/O Library Definitions.
+ */
+#include "tiff.h"
+#include "tiffvers.h"
+
+/*
+ * TIFF is defined as an incomplete type to hide the
+ * library's internal data structures from clients.
+ */
+typedef struct tiff TIFF;
+
+/*
+ * The following typedefs define the intrinsic size of
+ * data types used in the *exported* interfaces.  These
+ * definitions depend on the proper definition of types
+ * in tiff.h.  Note also that the varargs interface used
+ * to pass tag types and values uses the types defined in
+ * tiff.h directly.
+ *
+ * NB: ttag_t is unsigned int and not unsigned short because
+ *     ANSI C requires that the type before the ellipsis be a
+ *     promoted type (i.e. one of int, unsigned int, pointer,
+ *     or double) and because we defined pseudo-tags that are
+ *     outside the range of legal Aldus-assigned tags.
+ * NB: tsize_t is int32 and not uint32 because some functions
+ *     return -1.
+ * NB: toff_t is not off_t for many reasons; TIFFs max out at
+ *     32-bit file offsets, and BigTIFF maxes out at 64-bit
+ *     offsets being the most important, and to ensure use of
+ *     a consistently unsigned type across architectures.
+ *     Prior to libtiff 4.0, this was an unsigned 32 bit type.
+ */
+/*
+ * this is the machine addressing size type, only it's signed, so make it
+ * int32 on 32bit machines, int64 on 64bit machines
+ */
+typedef TIFF_SSIZE_T tmsize_t;
+typedef uint64 toff_t;          /* file offset */
+/* the following are deprecated and should be replaced by their defining
+   counterparts */
+typedef uint32 ttag_t;          /* directory tag */
+typedef uint16 tdir_t;          /* directory index */
+typedef uint16 tsample_t;       /* sample number */
+typedef uint32 tstrile_t;       /* strip or tile number */
+typedef tstrile_t tstrip_t;     /* strip number */
+typedef tstrile_t ttile_t;      /* tile number */
+typedef tmsize_t tsize_t;       /* i/o size in bytes */
+typedef void* tdata_t;          /* image data ref */
+
+#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))
+#define __WIN32__
+#endif
+
+/*
+ * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c
+ * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c).
+ *
+ * By default tif_unix.c is assumed.
+ */
+
+#if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+#  if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO)
+#    define AVOID_WIN32_FILEIO
+#  endif
+#endif
+
+#if defined(USE_WIN32_FILEIO)
+# define VC_EXTRALEAN
+# include <windows.h>
+# ifdef __WIN32__
+DECLARE_HANDLE(thandle_t);     /* Win32 file handle */
+# else
+typedef HFILE thandle_t;       /* client data handle */
+# endif /* __WIN32__ */
+#else
+typedef void* thandle_t;       /* client data handle */
+#endif /* USE_WIN32_FILEIO */
+
+/*
+ * Flags to pass to TIFFPrintDirectory to control
+ * printing of data structures that are potentially
+ * very large.   Bit-or these flags to enable printing
+ * multiple items.
+ */
+#define TIFFPRINT_NONE	       0x0    /* no extra info */
+#define TIFFPRINT_STRIPS       0x1    /* strips/tiles info */
+#define TIFFPRINT_CURVES       0x2    /* color/gray response curves */
+#define TIFFPRINT_COLORMAP     0x4    /* colormap */
+#define TIFFPRINT_JPEGQTABLES  0x100  /* JPEG Q matrices */
+#define TIFFPRINT_JPEGACTABLES 0x200  /* JPEG AC tables */
+#define TIFFPRINT_JPEGDCTABLES 0x200  /* JPEG DC tables */
+
+/* 
+ * Colour conversion stuff
+ */
+
+/* reference white */
+#define D65_X0 (95.0470F)
+#define D65_Y0 (100.0F)
+#define D65_Z0 (108.8827F)
+
+#define D50_X0 (96.4250F)
+#define D50_Y0 (100.0F)
+#define D50_Z0 (82.4680F)
+
+/* Structure for holding information about a display device. */
+
+typedef unsigned char TIFFRGBValue;               /* 8-bit samples */
+
+typedef struct {
+	float d_mat[3][3];                        /* XYZ -> luminance matrix */
+	float d_YCR;                              /* Light o/p for reference white */
+	float d_YCG;
+	float d_YCB;
+	uint32 d_Vrwr;                            /* Pixel values for ref. white */
+	uint32 d_Vrwg;
+	uint32 d_Vrwb;
+	float d_Y0R;                              /* Residual light for black pixel */
+	float d_Y0G;
+	float d_Y0B;
+	float d_gammaR;                           /* Gamma values for the three guns */
+	float d_gammaG;
+	float d_gammaB;
+} TIFFDisplay;
+
+typedef struct {                                  /* YCbCr->RGB support */
+	TIFFRGBValue* clamptab;                   /* range clamping table */
+	int* Cr_r_tab;
+	int* Cb_b_tab;
+	int32* Cr_g_tab;
+	int32* Cb_g_tab;
+	int32* Y_tab;
+} TIFFYCbCrToRGB;
+
+typedef struct {                                  /* CIE Lab 1976->RGB support */
+	int range;                                /* Size of conversion table */
+#define CIELABTORGB_TABLE_RANGE 1500
+	float rstep, gstep, bstep;
+	float X0, Y0, Z0;                         /* Reference white point */
+	TIFFDisplay display;
+	float Yr2r[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yr to r */
+	float Yg2g[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yg to g */
+	float Yb2b[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yb to b */
+} TIFFCIELabToRGB;
+
+/*
+ * RGBA-style image support.
+ */
+typedef struct _TIFFRGBAImage TIFFRGBAImage;
+/*
+ * The image reading and conversion routines invoke
+ * ``put routines'' to copy/image/whatever tiles of
+ * raw image data.  A default set of routines are 
+ * provided to convert/copy raw image data to 8-bit
+ * packed ABGR format rasters.  Applications can supply
+ * alternate routines that unpack the data into a
+ * different format or, for example, unpack the data
+ * and draw the unpacked raster on the display.
+ */
+typedef void (*tileContigRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*);
+typedef void (*tileSeparateRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*, unsigned char*, unsigned char*, unsigned char*);
+/*
+ * RGBA-reader state.
+ */
+struct _TIFFRGBAImage {
+	TIFF* tif;                              /* image handle */
+	int stoponerr;                          /* stop on read error */
+	int isContig;                           /* data is packed/separate */
+	int alpha;                              /* type of alpha data present */
+	uint32 width;                           /* image width */
+	uint32 height;                          /* image height */
+	uint16 bitspersample;                   /* image bits/sample */
+	uint16 samplesperpixel;                 /* image samples/pixel */
+	uint16 orientation;                     /* image orientation */
+	uint16 req_orientation;                 /* requested orientation */
+	uint16 photometric;                     /* image photometric interp */
+	uint16* redcmap;                        /* colormap pallete */
+	uint16* greencmap;
+	uint16* bluecmap;
+	/* get image data routine */
+	int (*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
+	/* put decoded strip/tile */
+	union {
+	    void (*any)(TIFFRGBAImage*);
+	    tileContigRoutine contig;
+	    tileSeparateRoutine separate;
+	} put;
+	TIFFRGBValue* Map;                      /* sample mapping array */
+	uint32** BWmap;                         /* black&white map */
+	uint32** PALmap;                        /* palette image map */
+	TIFFYCbCrToRGB* ycbcr;                  /* YCbCr conversion state */
+	TIFFCIELabToRGB* cielab;                /* CIE L*a*b conversion state */
+
+	uint8* UaToAa;                          /* Unassociated alpha to associated alpha convertion LUT */
+	uint8* Bitdepth16To8;                   /* LUT for conversion from 16bit to 8bit values */
+
+	int row_offset;
+	int col_offset;
+};
+
+/*
+ * Macros for extracting components from the
+ * packed ABGR form returned by TIFFReadRGBAImage.
+ */
+#define TIFFGetR(abgr) ((abgr) & 0xff)
+#define TIFFGetG(abgr) (((abgr) >> 8) & 0xff)
+#define TIFFGetB(abgr) (((abgr) >> 16) & 0xff)
+#define TIFFGetA(abgr) (((abgr) >> 24) & 0xff)
+
+/*
+ * A CODEC is a software package that implements decoding,
+ * encoding, or decoding+encoding of a compression algorithm.
+ * The library provides a collection of builtin codecs.
+ * More codecs may be registered through calls to the library
+ * and/or the builtin implementations may be overridden.
+ */
+typedef int (*TIFFInitMethod)(TIFF*, int);
+typedef struct {
+	char* name;
+	uint16 scheme;
+	TIFFInitMethod init;
+} TIFFCodec;
+
+#include <stdio.h>
+#include <stdarg.h>
+
+/* share internal LogLuv conversion routines? */
+#ifndef LOGLUV_PUBLIC
+#define LOGLUV_PUBLIC 1
+#endif
+
+#if !defined(__GNUC__) && !defined(__attribute__)
+#  define __attribute__(x) /*nothing*/
+#endif
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+typedef void (*TIFFErrorHandler)(const char*, const char*, va_list);
+typedef void (*TIFFErrorHandlerExt)(thandle_t, const char*, const char*, va_list);
+typedef tmsize_t (*TIFFReadWriteProc)(thandle_t, void*, tmsize_t);
+typedef toff_t (*TIFFSeekProc)(thandle_t, toff_t, int);
+typedef int (*TIFFCloseProc)(thandle_t);
+typedef toff_t (*TIFFSizeProc)(thandle_t);
+typedef int (*TIFFMapFileProc)(thandle_t, void** base, toff_t* size);
+typedef void (*TIFFUnmapFileProc)(thandle_t, void* base, toff_t size);
+typedef void (*TIFFExtendProc)(TIFF*);
+
+extern const char* TIFFGetVersion(void);
+
+extern const TIFFCodec* TIFFFindCODEC(uint16);
+extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod);
+extern void TIFFUnRegisterCODEC(TIFFCodec*);
+extern int TIFFIsCODECConfigured(uint16);
+extern TIFFCodec* TIFFGetConfiguredCODECs(void);
+
+/*
+ * Auxiliary functions.
+ */
+
+extern void* _TIFFmalloc(tmsize_t s);
+extern void* _TIFFrealloc(void* p, tmsize_t s);
+extern void _TIFFmemset(void* p, int v, tmsize_t c);
+extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c);
+extern int _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c);
+extern void _TIFFfree(void* p);
+
+/*
+** Stuff, related to tag handling and creating custom tags.
+*/
+extern int TIFFGetTagListCount( TIFF * );
+extern uint32 TIFFGetTagListEntry( TIFF *, int tag_index );
+    
+#define TIFF_ANY       TIFF_NOTYPE     /* for field descriptor searching */
+#define TIFF_VARIABLE  -1              /* marker for variable length tags */
+#define TIFF_SPP       -2              /* marker for SamplesPerPixel tags */
+#define TIFF_VARIABLE2 -3              /* marker for uint32 var-length tags */
+
+#define FIELD_CUSTOM    65
+
+typedef struct _TIFFField TIFFField;
+typedef struct _TIFFFieldArray TIFFFieldArray;
+
+extern const TIFFField* TIFFFindField(TIFF *, uint32, TIFFDataType);
+extern const TIFFField* TIFFFieldWithTag(TIFF*, uint32);
+extern const TIFFField* TIFFFieldWithName(TIFF*, const char *);
+
+extern uint32 TIFFFieldTag(const TIFFField*);
+extern const char* TIFFFieldName(const TIFFField*);
+extern TIFFDataType TIFFFieldDataType(const TIFFField*);
+extern int TIFFFieldPassCount(const TIFFField*);
+extern int TIFFFieldReadCount(const TIFFField*);
+extern int TIFFFieldWriteCount(const TIFFField*);
+
+typedef int (*TIFFVSetMethod)(TIFF*, uint32, va_list);
+typedef int (*TIFFVGetMethod)(TIFF*, uint32, va_list);
+typedef void (*TIFFPrintMethod)(TIFF*, FILE*, long);
+
+typedef struct {
+    TIFFVSetMethod vsetfield; /* tag set routine */
+    TIFFVGetMethod vgetfield; /* tag get routine */
+    TIFFPrintMethod printdir; /* directory print routine */
+} TIFFTagMethods;
+
+extern  TIFFTagMethods *TIFFAccessTagMethods(TIFF *);
+extern  void *TIFFGetClientInfo(TIFF *, const char *);
+extern  void TIFFSetClientInfo(TIFF *, void *, const char *);
+
+extern void TIFFCleanup(TIFF* tif);
+extern void TIFFClose(TIFF* tif);
+extern int TIFFFlush(TIFF* tif);
+extern int TIFFFlushData(TIFF* tif);
+extern int TIFFGetField(TIFF* tif, uint32 tag, ...);
+extern int TIFFVGetField(TIFF* tif, uint32 tag, va_list ap);
+extern int TIFFGetFieldDefaulted(TIFF* tif, uint32 tag, ...);
+extern int TIFFVGetFieldDefaulted(TIFF* tif, uint32 tag, va_list ap);
+extern int TIFFReadDirectory(TIFF* tif);
+extern int TIFFReadCustomDirectory(TIFF* tif, toff_t diroff, const TIFFFieldArray* infoarray);
+extern int TIFFReadEXIFDirectory(TIFF* tif, toff_t diroff);
+extern uint64 TIFFScanlineSize64(TIFF* tif);
+extern tmsize_t TIFFScanlineSize(TIFF* tif);
+extern uint64 TIFFRasterScanlineSize64(TIFF* tif);
+extern tmsize_t TIFFRasterScanlineSize(TIFF* tif);
+extern uint64 TIFFStripSize64(TIFF* tif);
+extern tmsize_t TIFFStripSize(TIFF* tif);
+extern uint64 TIFFRawStripSize64(TIFF* tif, uint32 strip);
+extern tmsize_t TIFFRawStripSize(TIFF* tif, uint32 strip);
+extern uint64 TIFFVStripSize64(TIFF* tif, uint32 nrows);
+extern tmsize_t TIFFVStripSize(TIFF* tif, uint32 nrows);
+extern uint64 TIFFTileRowSize64(TIFF* tif);
+extern tmsize_t TIFFTileRowSize(TIFF* tif);
+extern uint64 TIFFTileSize64(TIFF* tif);
+extern tmsize_t TIFFTileSize(TIFF* tif);
+extern uint64 TIFFVTileSize64(TIFF* tif, uint32 nrows);
+extern tmsize_t TIFFVTileSize(TIFF* tif, uint32 nrows);
+extern uint32 TIFFDefaultStripSize(TIFF* tif, uint32 request);
+extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+extern int TIFFFileno(TIFF*);
+extern int TIFFSetFileno(TIFF*, int);
+extern thandle_t TIFFClientdata(TIFF*);
+extern thandle_t TIFFSetClientdata(TIFF*, thandle_t);
+extern int TIFFGetMode(TIFF*);
+extern int TIFFSetMode(TIFF*, int);
+extern int TIFFIsTiled(TIFF*);
+extern int TIFFIsByteSwapped(TIFF*);
+extern int TIFFIsUpSampled(TIFF*);
+extern int TIFFIsMSB2LSB(TIFF*);
+extern int TIFFIsBigEndian(TIFF*);
+extern TIFFReadWriteProc TIFFGetReadProc(TIFF*);
+extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*);
+extern TIFFSeekProc TIFFGetSeekProc(TIFF*);                                                          
+extern TIFFCloseProc TIFFGetCloseProc(TIFF*);
+extern TIFFSizeProc TIFFGetSizeProc(TIFF*);
+extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*);
+extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*);
+extern uint32 TIFFCurrentRow(TIFF*);
+extern uint16 TIFFCurrentDirectory(TIFF*);
+extern uint16 TIFFNumberOfDirectories(TIFF*);
+extern uint64 TIFFCurrentDirOffset(TIFF*);
+extern uint32 TIFFCurrentStrip(TIFF*);
+extern uint32 TIFFCurrentTile(TIFF* tif);
+extern int TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size);
+extern int TIFFWriteBufferSetup(TIFF* tif, void* bp, tmsize_t size);  
+extern int TIFFSetupStrips(TIFF *);
+extern int TIFFWriteCheck(TIFF*, int, const char *);
+extern void TIFFFreeDirectory(TIFF*);
+extern int TIFFCreateDirectory(TIFF*);
+extern int TIFFCreateCustomDirectory(TIFF*,const TIFFFieldArray*);
+extern int TIFFCreateEXIFDirectory(TIFF*);
+extern int TIFFLastDirectory(TIFF*);
+extern int TIFFSetDirectory(TIFF*, uint16);
+extern int TIFFSetSubDirectory(TIFF*, uint64);
+extern int TIFFUnlinkDirectory(TIFF*, uint16);
+extern int TIFFSetField(TIFF*, uint32, ...);
+extern int TIFFVSetField(TIFF*, uint32, va_list);
+extern int TIFFUnsetField(TIFF*, uint32);
+extern int TIFFWriteDirectory(TIFF *);
+extern int TIFFWriteCustomDirectory(TIFF *, uint64 *);
+extern int TIFFCheckpointDirectory(TIFF *);
+extern int TIFFRewriteDirectory(TIFF *);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0);
+extern int TIFFReadScanline(TIFF* tif, void* buf, uint32 row, uint16 sample = 0);
+extern int TIFFWriteScanline(TIFF* tif, void* buf, uint32 row, uint16 sample = 0);
+extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0);
+extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*,
+    int = ORIENTATION_BOTLEFT, int = 0);
+#else
+extern void TIFFPrintDirectory(TIFF*, FILE*, long);
+extern int TIFFReadScanline(TIFF* tif, void* buf, uint32 row, uint16 sample);
+extern int TIFFWriteScanline(TIFF* tif, void* buf, uint32 row, uint16 sample);
+extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int);
+extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int);
+#endif
+
+extern int TIFFReadRGBAStrip(TIFF*, uint32, uint32 * );
+extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * );
+extern int TIFFRGBAImageOK(TIFF*, char [1024]);
+extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]);
+extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32);
+extern void TIFFRGBAImageEnd(TIFFRGBAImage*);
+extern TIFF* TIFFOpen(const char*, const char*);
+# ifdef __WIN32__
+extern TIFF* TIFFOpenW(const wchar_t*, const char*);
+# endif /* __WIN32__ */
+extern TIFF* TIFFFdOpen(int, const char*, const char*);
+extern TIFF* TIFFClientOpen(const char*, const char*,
+	    thandle_t,
+	    TIFFReadWriteProc, TIFFReadWriteProc,
+	    TIFFSeekProc, TIFFCloseProc,
+	    TIFFSizeProc,
+	    TIFFMapFileProc, TIFFUnmapFileProc);
+extern const char* TIFFFileName(TIFF*);
+extern const char* TIFFSetFileName(TIFF*, const char *);
+extern void TIFFError(const char*, const char*, ...) __attribute__((__format__ (__printf__,2,3)));
+extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((__format__ (__printf__,3,4)));
+extern void TIFFWarning(const char*, const char*, ...) __attribute__((__format__ (__printf__,2,3)));
+extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((__format__ (__printf__,3,4)));
+extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
+extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
+extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);
+extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt);
+extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc);
+extern uint32 TIFFComputeTile(TIFF* tif, uint32 x, uint32 y, uint32 z, uint16 s);
+extern int TIFFCheckTile(TIFF* tif, uint32 x, uint32 y, uint32 z, uint16 s);
+extern uint32 TIFFNumberOfTiles(TIFF*);
+extern tmsize_t TIFFReadTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s);  
+extern tmsize_t TIFFWriteTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s);
+extern uint32 TIFFComputeStrip(TIFF*, uint32, uint16);
+extern uint32 TIFFNumberOfStrips(TIFF*);
+extern tmsize_t TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size);
+extern tmsize_t TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size);  
+extern tmsize_t TIFFReadEncodedTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size);  
+extern tmsize_t TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size);  
+extern tmsize_t TIFFWriteEncodedStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc);
+extern tmsize_t TIFFWriteRawStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc);  
+extern tmsize_t TIFFWriteEncodedTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc);  
+extern tmsize_t TIFFWriteRawTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc);  
+extern int TIFFDataWidth(TIFFDataType);    /* table of tag datatype widths */
+extern void TIFFSetWriteOffset(TIFF* tif, toff_t off);
+extern void TIFFSwabShort(uint16*);
+extern void TIFFSwabLong(uint32*);
+extern void TIFFSwabLong8(uint64*);
+extern void TIFFSwabFloat(float*);
+extern void TIFFSwabDouble(double*);
+extern void TIFFSwabArrayOfShort(uint16* wp, tmsize_t n);
+extern void TIFFSwabArrayOfTriples(uint8* tp, tmsize_t n);
+extern void TIFFSwabArrayOfLong(uint32* lp, tmsize_t n);
+extern void TIFFSwabArrayOfLong8(uint64* lp, tmsize_t n);
+extern void TIFFSwabArrayOfFloat(float* fp, tmsize_t n);
+extern void TIFFSwabArrayOfDouble(double* dp, tmsize_t n);
+extern void TIFFReverseBits(uint8* cp, tmsize_t n);
+extern const unsigned char* TIFFGetBitRevTable(int);
+
+#ifdef LOGLUV_PUBLIC
+#define U_NEU		0.210526316
+#define V_NEU		0.473684211
+#define UVSCALE		410.
+extern double LogL16toY(int);
+extern double LogL10toY(int);
+extern void XYZtoRGB24(float*, uint8*);
+extern int uv_decode(double*, double*, int);
+extern void LogLuv24toXYZ(uint32, float*);
+extern void LogLuv32toXYZ(uint32, float*);
+#if defined(c_plusplus) || defined(__cplusplus)
+extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER);
+extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER);
+extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER);
+extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER);
+extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER);
+#else
+extern int LogL16fromY(double, int);
+extern int LogL10fromY(double, int);
+extern int uv_encode(double, double, int);
+extern uint32 LogLuv24fromXYZ(float*, int);
+extern uint32 LogLuv32fromXYZ(float*, int);
+#endif
+#endif /* LOGLUV_PUBLIC */
+
+extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, const TIFFDisplay *, float*);
+extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32,
+    float *, float *, float *);
+extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float,
+    uint32 *, uint32 *, uint32 *);
+
+extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*);
+extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32,
+    uint32 *, uint32 *, uint32 *);
+
+/****************************************************************************
+ *               O B S O L E T E D    I N T E R F A C E S
+ *
+ * Don't use this stuff in your applications, it may be removed in the future
+ * libtiff versions.
+ ****************************************************************************/
+typedef	struct {
+	ttag_t	field_tag;		/* field's tag */
+	short	field_readcount;	/* read count/TIFF_VARIABLE/TIFF_SPP */
+	short	field_writecount;	/* write count/TIFF_VARIABLE */
+	TIFFDataType field_type;	/* type of associated data */
+        unsigned short field_bit;	/* bit in fieldsset bit vector */
+	unsigned char field_oktochange;	/* if true, can change while writing */
+	unsigned char field_passcount;	/* if true, pass dir count on set */
+	char	*field_name;		/* ASCII name */
+} TIFFFieldInfo;
+
+extern int TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32);
+        
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif /* _TIFFIO_ */
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */
diff -Nru goldendict-1.5.0~git20131003/winlibs/include/tiff/tiffvers.h goldendict-1.5.0~git20150923/winlibs/include/tiff/tiffvers.h
--- goldendict-1.5.0~git20131003/winlibs/include/tiff/tiffvers.h	1970-01-01 00:00:00.000000000 +0000
+++ goldendict-1.5.0~git20150923/winlibs/include/tiff/tiffvers.h	2015-09-23 08:26:24.000000000 +0000
@@ -0,0 +1,9 @@
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.3\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+/*
+ * This define can be used in code that requires
+ * compilation-related definitions specific to a
+ * version or versions of the library.  Runtime
+ * version checking should be done based on the
+ * string returned by TIFFGetVersion.
+ */
+#define TIFFLIB_VERSION 20120922
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/avcodec-gd-54.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/avcodec-gd-54.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/avformat-gd-54.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/avformat-gd-54.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/avutil-gd-52.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/avutil-gd-52.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libao-4.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libao-4.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libao.dll.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libao.dll.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libavcodec-gd.dll.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libavcodec-gd.dll.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libavformat-gd.dll.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libavformat-gd.dll.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libavutil-gd.dll.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libavutil-gd.dll.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libbz2.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libbz2.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libeb-16.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libeb-16.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libgcc_s_dw2-1.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libgcc_s_dw2-1.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libiconv-2.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libiconv-2.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libiconv.dll.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libiconv.dll.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/liblzma.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/liblzma.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/liblzo2.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/liblzo2.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libogg.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libogg.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libtiff-5.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libtiff-5.dll differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libvorbis.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libvorbis.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libvorbisfile.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libvorbisfile.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/libz.dll.a and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/libz.dll.a differ
Binary files /tmp/tfsuf_fVoJ/goldendict-1.5.0~git20131003/winlibs/lib/zlib1.dll and /tmp/nAvqxsPo0O/goldendict-1.5.0~git20150923/winlibs/lib/zlib1.dll differ
diff -Nru goldendict-1.5.0~git20131003/wordbyauto.cc goldendict-1.5.0~git20150923/wordbyauto.cc
--- goldendict-1.5.0~git20131003/wordbyauto.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/wordbyauto.cc	2015-09-23 08:26:24.000000000 +0000
@@ -4,7 +4,7 @@
 #include "uiauto.hh"
 
 #include <cstdio>
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 class GDAutomationClient {
 public:
@@ -49,14 +49,14 @@
 RECT r = { 0, 0, 0, 0 };
 bool bGoUp;
 
-    DPRINTF("\nEntering getWordAtPoint\n");
+    GD_DPRINTF("\nEntering getWordAtPoint\n");
 
     if( pGDAutomation == NULL ) return false;
 
     buffer[0] = 0;
     pElement = NULL;
     hr = pGDAutomation->ElementFromPoint( pt, &pElement );
-    DPRINTF("ElementFromPoint return hr=%08lX, ptr=%p\n", hr, pElement);
+    GD_DPRINTF("ElementFromPoint return hr=%08lX, ptr=%p\n", hr, pElement);
     if( hr != S_OK || pElement == NULL )
         return false;
 
diff -Nru goldendict-1.5.0~git20131003/wordfinder.cc goldendict-1.5.0~git20150923/wordfinder.cc
--- goldendict-1.5.0~git20131003/wordfinder.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/wordfinder.cc	2015-09-23 08:26:24.000000000 +0000
@@ -6,7 +6,7 @@
 #include "wstring_qt.hh"
 #include <QThreadPool>
 #include <map>
-#include "dprintf.hh"
+#include "gddebug.hh"
 
 using std::vector;
 using std::list;
@@ -86,6 +86,31 @@
     startSearch();
 }
 
+void WordFinder::expressionMatch( QString const & str,
+                                  std::vector< sptr< Dictionary::Class > > const & dicts,
+                                  unsigned long maxResults,
+                                  Dictionary::Features features )
+{
+  cancel();
+
+  searchQueued = true;
+  searchType = ExpressionMatch;
+  inputWord = str;
+  inputDicts = &dicts;
+  requestedMaxResults = maxResults;
+  requestedFeatures = features;
+
+  resultsArray.clear();
+  resultsIndex.clear();
+  searchResults.clear();
+
+  if ( queuedRequests.empty() )
+  {
+    // No requests are queued, no need to wait for them to finish.
+    startSearch();
+  }
+}
+
 void WordFinder::startSearch()
 {
   if ( !searchQueued )
@@ -127,7 +152,7 @@
       try
       {
         sptr< Dictionary::WordSearchRequest > sr =
-          ( searchType == PrefixMatch ) ?
+          ( searchType == PrefixMatch || searchType == ExpressionMatch ) ?
             (*inputDicts)[ x ]->prefixMatch( allWordWritings[ y ], requestedMaxResults ) :
             (*inputDicts)[ x ]->stemmedMatch( allWordWritings[ y ], stemmedMinLength, stemmedMaxSuffixVariation, requestedMaxResults );
 
@@ -138,9 +163,8 @@
       }
       catch( std::exception & e )
       {
-        qWarning() << "Word \"" << inputWord << "\" search error (" << e.what() << ") in \""
-                   << QString::fromUtf8( (*inputDicts)[ x ]->getName().c_str() )
-                   << "\"";
+        gdWarning( "Word \"%s\" search error (%s) in \"%s\"\n",
+                   inputWord.toUtf8().data(), e.what(), (*inputDicts)[ x ]->getName().c_str() );
       }
     }
   }
@@ -274,6 +298,8 @@
   if ( updateResultsTimer.isActive() )
     updateResultsTimer.stop(); // Can happen when we were done before it'd expire
 
+  wstring original = Folding::applySimpleCaseOnly( allWordWritings[ 0 ] );
+
   for( list< sptr< Dictionary::WordSearchRequest > >::iterator i =
          finishedRequests.begin(); i != finishedRequests.end(); )
   {
@@ -283,6 +309,30 @@
       int weight = (**i)[ x ].weight;
       wstring lowerCased = Folding::applySimpleCaseOnly( match );
 
+      if( searchType == ExpressionMatch )
+      {
+        unsigned ws;
+
+        for( ws = 0; ws < allWordWritings.size(); ws++ )
+        {
+          if( ws == 0 )
+          {
+            // Check for prefix match with original expression
+            if( lowerCased.compare( 0, original.size(), original ) == 0 )
+              break;
+          }
+          else
+          if( lowerCased == Folding::applySimpleCaseOnly( allWordWritings[ ws ] ) )
+            break;
+        }
+
+        if( ws >= allWordWritings.size() )
+        {
+          // No exact matches found
+          continue;
+        }
+        weight = ws;
+      }
       pair< ResultsIndex::iterator, bool > insertResult =
         resultsIndex.insert( pair< wstring, ResultsArray::iterator >( lowerCased,
                                                                       resultsArray.end() ) );
@@ -401,6 +451,7 @@
       resultsArray.sort( SortByRank() );
     }
     else
+    if( searchType == StemmedMatch )
     {
       // Handling stemmed matches
 
diff -Nru goldendict-1.5.0~git20131003/wordfinder.hh goldendict-1.5.0~git20150923/wordfinder.hh
--- goldendict-1.5.0~git20131003/wordfinder.hh	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/wordfinder.hh	2015-09-23 08:26:24.000000000 +0000
@@ -41,7 +41,8 @@
   enum SearchType
   {
     PrefixMatch,
-    StemmedMatch
+    StemmedMatch,
+    ExpressionMatch
   } searchType;
   unsigned long requestedMaxResults;
   Dictionary::Features requestedFeatures;
@@ -94,6 +95,13 @@
                      unsigned long maxResults = 30,
                      Dictionary::Features = Dictionary::NoFeatures );
   
+  /// Do the expression-match search in the given list of dictionaries.
+  /// Function find exact matches for one of spelling suggestions.
+  void expressionMatch( QString const &,
+                        std::vector< sptr< Dictionary::Class > > const &,
+                        unsigned long maxResults = 40,
+                        Dictionary::Features = Dictionary::NoFeatures );
+
   /// Returns the vector containing search results from the last operation.
   /// If it didn't finish yet, the result is not final and may be changing
   /// over time.
diff -Nru goldendict-1.5.0~git20131003/wordlist.cc goldendict-1.5.0~git20150923/wordlist.cc
--- goldendict-1.5.0~git20131003/wordlist.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/wordlist.cc	2015-09-23 08:26:24.000000000 +0000
@@ -137,3 +137,20 @@
   }
 
 }
+
+void WordList::resizeEvent( QResizeEvent * ev )
+{
+  // In some rare cases Qt start send QResizeEvent recursively
+  // up to full stack depletion (tested on Qt 4.8.5, 4.8.6).
+  // We use this trick to break such suicidal process.
+
+  for( int x = 0; x < resizedSizes.size(); x++ )
+    if( resizedSizes.at( x ) == ev->size() )
+      return;
+
+  resizedSizes.push_back( ev->size() );
+
+  QListWidget::resizeEvent( ev );
+
+  resizedSizes.pop_back();
+}
diff -Nru goldendict-1.5.0~git20131003/wordlist.hh goldendict-1.5.0~git20150923/wordlist.hh
--- goldendict-1.5.0~git20131003/wordlist.hh	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/wordlist.hh	2015-09-23 08:26:24.000000000 +0000
@@ -19,6 +19,9 @@
   virtual void setTranslateLine(QLineEdit * line)
   { translateLine = line; }
 
+protected:
+  virtual void resizeEvent( QResizeEvent * ev );
+
 signals:
   void statusBarMessage(QString const & message, int timeout = 0, QPixmap const & pixmap = QPixmap());
   void contentChanged();
@@ -36,6 +39,8 @@
   WordFinder * wordFinder;
   QLineEdit * translateLine;
   WordListItemDelegate listItemDelegate;
+
+  QVector< QSize > resizedSizes;
 };
 
 #endif // WORDLIST_HH
diff -Nru goldendict-1.5.0~git20131003/xdxf2html.cc goldendict-1.5.0~git20150923/xdxf2html.cc
--- goldendict-1.5.0~git20131003/xdxf2html.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/xdxf2html.cc	2015-09-23 08:26:24.000000000 +0000
@@ -3,7 +3,7 @@
 
 #include "xdxf2html.hh"
 #include <QtXml>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "utf8.hh"
 #include "wstring_qt.hh"
 #include "folding.hh"
@@ -57,7 +57,8 @@
 }
 
 string convert( string const & in, DICT_TYPE type, map < string, string > const * pAbrv,
-                Dictionary::Class *dictPtr, bool isLogicalFormat, unsigned revisionNumber )
+                Dictionary::Class *dictPtr,  IndexedZip * resourceZip,
+                bool isLogicalFormat, unsigned revisionNumber, QString * headword )
 {
 //  DPRINTF( "Source>>>>>>>>>>: %s\n\n\n", in.c_str() );
 
@@ -124,7 +125,7 @@
   if( !dd.setContent( QByteArray( in_data.c_str() ), false, &errorStr, &errorLine, &errorColumn  ) )
   {
     qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
-    qWarning( "The input was: %s\n", in.c_str() );
+    gdWarning( "The input was: %s\n", in.c_str() );
 
     return in;
   }
@@ -154,6 +155,9 @@
 
   nodes = dd.elementsByTagName( "k" ); // Key
 
+  if( headword )
+    headword->clear();
+
   while( nodes.size() )
   {
     QDomElement el = nodes.at( 0 ).toElement();
@@ -165,6 +169,9 @@
     }
     else
     {
+        if( headword && headword->isEmpty() )
+          *headword = el.text();
+
         el.setTagName( "div" );
         el.setAttribute( "class", "xdxf_headwords" );
         if( dictPtr->isFromLanguageRTL() != dictPtr->isToLanguageRTL() )
@@ -303,8 +310,12 @@
   {
     QDomElement el = nodes.at( 0 ).toElement();
 
+    QString ref = el.attribute( "href" );
+    if( ref.isEmpty() )
+      ref = el.text();
+
+    el.setAttribute( "href", ref );
     el.setTagName( "a" );
-    el.setAttribute( "href", el.text() );
   }
 
   // Abbreviations
@@ -499,15 +510,40 @@
         }
         else if( Filetype::isNameOfSound( filename ) )
         {
-          QUrl url;
-          url.setScheme( "gdau" );
-          url.setHost( QString::fromUtf8( dictPtr->getId().c_str() ) );
-          url.setPath( QString::fromUtf8( filename.c_str() ) );
-
           QDomElement el_script = dd.createElement( "script" );
           QDomNode parent = el.parentNode();
           if( !parent.isNull() )
           {
+            bool search = false;
+            if( type == STARDICT )
+            {
+              string n = FsEncoding::dirname( dictPtr->getDictionaryFilenames()[ 0 ] ) +
+                         FsEncoding::separator() + string( "res" ) + FsEncoding::separator() +
+                         FsEncoding::encode( filename );
+              search = !File::exists( n ) &&
+                       ( !resourceZip ||
+                         !resourceZip->isOpen() ||
+                         !resourceZip->hasFile( Utf8::decode( filename ) ) );
+            }
+            else
+            {
+              string n = dictPtr->getDictionaryFilenames()[ 0 ] + ".files" +
+                         FsEncoding::separator() +
+                         FsEncoding::encode( filename );
+              search = !File::exists( n ) && !File::exists( FsEncoding::dirname( dictPtr->getDictionaryFilenames()[ 0 ] ) +
+                                                            FsEncoding::separator() +
+                                                            FsEncoding::encode( filename ) ) &&
+                       ( !resourceZip ||
+                         !resourceZip->isOpen() ||
+                         !resourceZip->hasFile( Utf8::decode( filename ) ) );
+            }
+
+
+            QUrl url;
+            url.setScheme( "gdau" );
+            url.setHost( QString::fromUtf8( search ? "search" : dictPtr->getId().c_str() ) );
+            url.setPath( QString::fromUtf8( filename.c_str() ) );
+
             el_script.setAttribute( "type", "text/javascript" );
             parent.replaceChild( el_script, el );
 
diff -Nru goldendict-1.5.0~git20131003/xdxf2html.hh goldendict-1.5.0~git20150923/xdxf2html.hh
--- goldendict-1.5.0~git20131003/xdxf2html.hh	2013-08-16 09:41:47.000000000 +0000
+++ goldendict-1.5.0~git20150923/xdxf2html.hh	2015-09-23 08:26:24.000000000 +0000
@@ -7,6 +7,7 @@
 #include <string>
 #include <map>
 #include "dictionary.hh"
+#include "indexedzip.hh"
 
 /// Xdxf is an xml file format. Since we display html, we'd like to be able
 /// to convert articles with such a markup to an html.
@@ -19,8 +20,9 @@
 
 /// Converts the given xdxf markup to an html one. This is currently used
 /// for Stardict's 'x' records.
-string convert( string const &, DICT_TYPE type = STARDICT, map < string, string > const * pAbrv = NULL,
-                Dictionary::Class *dictPtr = NULL, bool isLogicalFormat = false, unsigned revisionNumber = 0 ); 
+string convert( string const &, DICT_TYPE type, map < string, string > const * pAbrv,
+                Dictionary::Class *dictPtr, IndexedZip * resourceZip, bool isLogicalFormat = false,
+                unsigned revisionNumber = 0, QString * headword = 0 );
 
 }
 
diff -Nru goldendict-1.5.0~git20131003/xdxf.cc goldendict-1.5.0~git20150923/xdxf.cc
--- goldendict-1.5.0~git20131003/xdxf.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/xdxf.cc	2015-09-23 08:26:24.000000000 +0000
@@ -16,7 +16,7 @@
 #include <list>
 #include <wctype.h>
 #include <stdlib.h>
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "wstring_qt.hh"
 #include "xdxf2html.hh"
 #include "ufile.hh"
@@ -24,6 +24,8 @@
 #include "langcoder.hh"
 #include "indexedzip.hh"
 #include "filetype.hh"
+#include "tiff.hh"
+#include "ftshelpers.hh"
 
 #ifdef _MSC_VER
 #include <stub_msvc.h>
@@ -36,6 +38,7 @@
 #include <QDir>
 #include <QPainter>
 #include <QDebug>
+#include <QRegExp>
 
 #include <QSemaphore>
 #include <QThreadPool>
@@ -61,6 +64,7 @@
 DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
 DEF_EX_STR( exNotXdxfFile, "The file is not an XDXF file:", Dictionary::Ex )
 DEF_EX( exCorruptedIndex, "The index file is corrupted", Dictionary::Ex )
+DEF_EX_STR( exDictzipError, "DICTZIP error", Dictionary::Ex )
 
 enum
 {
@@ -169,6 +173,21 @@
 
   virtual QString getMainFilename();
 
+  virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                            int searchMode, bool matchCase,
+                                                            int distanceBetweenWords,
+                                                            int maxResults );
+  virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+  virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+  virtual void setFTSParameters( Config::FullTextSearch const & fts )
+  {
+    can_FTS = fts.enabled
+              && !fts.disabledTypes.contains( "XDXF", Qt::CaseInsensitive )
+              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
+
 protected:
 
   void loadIcon() throw();
@@ -177,7 +196,7 @@
 
   // Loads the article, storing its headword and formatting article's data into an html.
   void loadArticle( uint32_t address,
-                    string & articleText );
+                    string & articleText, QString * headword = 0 );
 
   friend class XdxfArticleRequest;
   friend class XdxfResourceRequest;
@@ -204,10 +223,12 @@
 
   // Open the file
 
-  dz = dict_data_open( dictionaryFiles[ 0 ].c_str(), 0 );
+  DZ_ERRORS error;
+  dz = dict_data_open( dictionaryFiles[ 0 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exCantReadFile( dictionaryFiles[ 0 ] );
+    throw exDictzipError( string( dz_error_str( error ) )
+                          + "(" + dictionaryFiles[ 0 ] + ")" );
 
   // Read the abrv, if any
 
@@ -263,6 +284,16 @@
   openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
                         idxHeader.indexRootOffset ),
              idx, idxMutex );
+
+  // Full-text search parameters
+
+  can_FTS = true;
+
+  ftsIdxName = indexFile + "_FTS";
+
+  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+    FTS_index_completed.ref();
 }
 
 XdxfDictionary::~XdxfDictionary()
@@ -321,7 +352,7 @@
               Mutex::Lock _( idxMutex );
               descr = chunks->getBlock( idxHeader.descriptionAddress, chunk );
             }
-            dictionaryDescription = QString::fromUtf8( descr );
+            dictionaryDescription = QString::fromUtf8( descr, idxHeader.descriptionSize );
         }
         catch(...)
         {
@@ -335,6 +366,61 @@
   return FsEncoding::decode( getDictionaryFilenames()[ 0 ].c_str() );
 }
 
+void XdxfDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+    return;
+
+  gdDebug( "Xdxf: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    FtsHelpers::makeFTSIndex( this, isCancelled );
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Xdxf: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void XdxfDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    string articleStr;
+    loadArticle( articleAddress, articleStr, &headword );
+
+    wstring wstr = Utf8::decode( articleStr );
+
+    text = Html::unescape( gd::toQString( wstr ) );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Xdxf: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+sptr< Dictionary::DataRequest > XdxfDictionary::getSearchResults( QString const & searchString,
+                                                                  int searchMode, bool matchCase,
+                                                                  int distanceBetweenWords,
+                                                                  int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 /// XdxfDictionary::getArticle()
 
 class XdxfArticleRequest;
@@ -468,7 +554,7 @@
     }
     catch( std::exception &ex )
     {
-      qWarning( "XDXF: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      gdWarning( "XDXF: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
     }
   }
 
@@ -526,7 +612,8 @@
 }
 
 void XdxfDictionary::loadArticle( uint32_t address,
-                                  string & articleText )
+                                  string & articleText,
+                                  QString * headword )
 {
   // Read the properties
 
@@ -572,7 +659,7 @@
   }
 
   articleText = Xdxf2Html::convert( string( articleBody ), Xdxf2Html::XDXF, idxHeader.hasAbrv ? &abrv : NULL, this,
-                                    fType == Logical, idxHeader.revisionNumber );
+                                    &resourceZip, fType == Logical, idxHeader.revisionNumber, headword );
 
   free( articleBody );
 }
@@ -608,7 +695,7 @@
 
   virtual qint64 readData( char * data, qint64 maxSize );
 
-  virtual bool atEnd();
+  virtual bool atEnd() const;
 
   virtual qint64 writeData ( const char * /*data*/, qint64 /*maxSize*/ )
   { return -1; }
@@ -620,8 +707,8 @@
   if ( !gz )
     throw exCantReadFile( fileName );
 
-  dz = dict_data_open( fileName, 0 );
-
+  DZ_ERRORS error;
+  dz = dict_data_open( fileName, &error, 0 );
 }
 
 GzippedFile::~GzippedFile()
@@ -631,7 +718,7 @@
       dict_data_close( dz );
 }
 
-bool GzippedFile::atEnd()
+bool GzippedFile::atEnd() const
 {
   return gzeof( gz );
 }
@@ -810,6 +897,9 @@
         chunks.addToBlock( &offs, sizeof( offs ) );
         chunks.addToBlock( &size, sizeof( size ) );
 
+        // Add also first header - it's needed for full-text search
+        chunks.addToBlock( words.begin()->toUtf8().data(), words.begin()->toUtf8().length() + 1 );
+
 //        DPRINTF( "%x: %s\n", articleOffset, words.begin()->toUtf8().data() );
 
         // Add words to index
@@ -919,7 +1009,7 @@
     FsEncoding::separator() +
     FsEncoding::encode( resourceName );
 
-  DPRINTF( "n is %s\n", n.c_str() );
+  GD_DPRINTF( "n is %s\n", n.c_str() );
 
   try
   {
@@ -968,6 +1058,11 @@
       QImage img = QImage::fromData( (unsigned char *) &data.front(),
                                      data.size() );
 
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+      if( img.isNull() )
+        GdTiff::tiffToQImage( &data.front(), data.size(), img );
+#endif
+
       dataMutex.unlock();
 
       if ( !img.isNull() )
@@ -993,8 +1088,8 @@
   }
   catch( std::exception &ex )
   {
-    qWarning( "XDXF: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-              resourceName.c_str(), dict.getName().c_str(), ex.what() );
+    gdWarning( "XDXF: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
+               resourceName.c_str(), dict.getName().c_str(), ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1054,7 +1149,7 @@
       {
         // Building the index
 
-        qDebug( "Xdxf: Building the index for dictionary: %s\n", i->c_str() );
+        gdDebug( "Xdxf: Building the index for dictionary: %s\n", i->c_str() );
 
         //initializing.indexingDictionary( nameFromFileName( dictFiles[ 0 ] ) );
 
@@ -1114,7 +1209,10 @@
               idxHeader.langTo = LangCoder::findIdForLanguageCode3( str.c_str() );
 
               bool isLogical = ( stream.attributes().value( "format" ) == "logical" );
-              idxHeader.revisionNumber = stream.attributes().value( "revision" ).toString().toUInt();
+
+              QRegExp regNum( "\\d+" );
+              regNum.indexIn( stream.attributes().value( "revision" ).toString() );
+              idxHeader.revisionNumber = regNum.cap().toUInt();
 
               idxHeader.articleFormat = isLogical ? Logical : Visual;
 
@@ -1149,7 +1247,7 @@
                     }
                     else
                     {
-                      DPRINTF( "Warning: duplicate full_name in %s\n", dictFiles[ 0 ].c_str() );
+                      GD_DPRINTF( "Warning: duplicate full_name in %s\n", dictFiles[ 0 ].c_str() );
                     }
                   }
                   else
@@ -1171,7 +1269,7 @@
                     }
                     else
                     {
-                      DPRINTF( "Warning: duplicate description in %s\n", dictFiles[ 0 ].c_str() );
+                      GD_DPRINTF( "Warning: duplicate description in %s\n", dictFiles[ 0 ].c_str() );
                     }
                   }
                   else
@@ -1282,7 +1380,7 @@
 
               if ( zipFileName.size() )
               {
-                DPRINTF( "Indexing zip file\n" );
+                GD_DPRINTF( "Indexing zip file\n" );
 
                 idxHeader.hasZipFile = 1;
 
@@ -1334,9 +1432,9 @@
 
         if ( stream.hasError() )
         {
-          qWarning( "Warning: %s had a parse error %ls at line %lu, and therefore was indexed only up to the point of error.",
-                     dictFiles[ 0 ].c_str(), stream.errorString().toStdWString().c_str(),
-                     (unsigned long) stream.lineNumber() );
+          gdWarning( "Warning: %s had a parse error %s at line %lu, and therefore was indexed only up to the point of error.",
+                      dictFiles[ 0 ].c_str(), stream.errorString().toUtf8().data(),
+                      (unsigned long) stream.lineNumber() );
         }
       }
 
@@ -1346,8 +1444,8 @@
     }
     catch( std::exception & e )
     {
-      qWarning( "Xdxf dictionary reading failed: %s, error: %s\n",
-                i->c_str(), e.what() );
+      gdWarning( "Xdxf dictionary initializing failed: %s, error: %s\n",
+                 i->c_str(), e.what() );
     }
   }
 
diff -Nru goldendict-1.5.0~git20131003/zim.cc goldendict-1.5.0~git20150923/zim.cc
--- goldendict-1.5.0~git20131003/zim.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/zim.cc	2015-09-23 08:26:24.000000000 +0000
@@ -7,13 +7,16 @@
 #include "btreeidx.hh"
 #include "fsencoding.hh"
 #include "folding.hh"
-#include "dprintf.hh"
+#include "gddebug.hh"
 #include "utf8.hh"
 #include "decompress.hh"
 #include "langcoder.hh"
 #include "wstring_qt.hh"
 #include "filetype.hh"
 #include "file.hh"
+#include "tiff.hh"
+#include "ftshelpers.hh"
+#include "htmlescape.hh"
 
 #ifdef _MSC_VER
 #include <stub_msvc.h>
@@ -50,6 +53,8 @@
 
 DEF_EX_STR( exNotZimFile, "Not an Zim file", Dictionary::Ex )
 DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
+
 
 //namespace {
 
@@ -313,9 +318,11 @@
          header.formatVersion != CurrentFormatVersion;
 }
 
-quint32 readArticle( ZimFile & file, ZIM_header & header, uint32_t articleNumber, string & result,
+quint32 readArticle( ZimFile & file, ZIM_header & header, quint32 articleNumber, string & result,
                      set< quint32 > * loadedArticles = NULL )
 {
+  result.clear();
+
   while( 1 )
   {
     if( articleNumber >= header.articleCount )
@@ -404,7 +411,6 @@
     memcpy( offsets, decompressedData.data() + artEntry.blobNumber * 4, sizeof(offsets) );
     quint32 size = offsets[ 1 ] - offsets[ 0 ];
 
-    result.clear();
     result.append( decompressedData, offsets[ 0 ], size );
 
     return articleNumber;
@@ -416,6 +422,8 @@
 
 class ZimDictionary: public BtreeIndexing::BtreeDictionary
 {
+    enum LINKS_TYPE { UNKNOWN, SLASH, NO_SLASH };
+
     Mutex idxMutex;
     Mutex zimMutex, idxResourceMutex;
     File::Class idx;
@@ -424,6 +432,8 @@
     string dictionaryName;
     ZimFile df;
     ZIM_header zimHeader;
+    set< quint32 > articlesIndexedForFTS;
+    LINKS_TYPE linksType;
 
   public:
 
@@ -463,6 +473,24 @@
     /// Loads the resource.
     void loadResource( std::string &resourceName, string & data );
 
+    virtual sptr< Dictionary::DataRequest > getSearchResults( QString const & searchString,
+                                                              int searchMode, bool matchCase,
+                                                              int distanceBetweenWords,
+                                                              int maxResults );
+    virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
+
+    quint32 getArticleText( uint32_t articleAddress, QString & headword, QString & text,
+                            set< quint32 > * loadedArticles );
+
+    virtual void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration );
+
+    virtual void setFTSParameters( Config::FullTextSearch const & fts )
+    {
+      can_FTS = fts.enabled
+                && !fts.disabledTypes.contains( "ZIM", Qt::CaseInsensitive )
+                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    }
+
 protected:
 
     virtual void loadIcon() throw();
@@ -472,7 +500,8 @@
     /// Loads the article.
     quint32 loadArticle( quint32 address,
                          string & articleText,
-                         set< quint32 > * loadedArticles );
+                         set< quint32 > * loadedArticles,
+                         bool rawText = false );
 
     string convert( string const & in_data );
     friend class ZimArticleRequest;
@@ -485,7 +514,8 @@
     BtreeDictionary( id, dictionaryFiles ),
     idx( indexFile, "rb" ),
     idxHeader( idx.read< IdxHeader >() ),
-    df( FsEncoding::decode( dictionaryFiles[ 0 ].c_str() ) )
+    df( FsEncoding::decode( dictionaryFiles[ 0 ].c_str() ) ),
+    linksType( UNKNOWN )
 {
     // Open data file
 
@@ -515,6 +545,16 @@
     {
       readArticle( df, zimHeader, idxHeader.namePtr, dictionaryName );
     }
+
+    // Full-text search parameters
+
+    can_FTS = true;
+
+    ftsIdxName = indexFile + "_FTS";
+
+    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
+        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+      FTS_index_completed.ref();
 }
 
 ZimDictionary::~ZimDictionary()
@@ -544,14 +584,16 @@
 
 quint32 ZimDictionary::loadArticle( quint32 address,
                                     string & articleText,
-                                    set< quint32 > * loadedArticles )
+                                    set< quint32 > * loadedArticles,
+                                    bool rawText )
 {
 quint32 ret;
   {
     Mutex::Lock _( zimMutex );
     ret = readArticle( df, zimHeader, address, articleText, loadedArticles );
   }
-  articleText = convert( articleText );
+  if( !rawText )
+    articleText = convert( articleText );
   return ret;
 }
 
@@ -559,20 +601,116 @@
 {
   QString text = QString::fromUtf8( in.c_str() );
 
-  text.replace( QRegExp( "<\\s*body\\s*([^>]*)background:([^;\"]*)" ),
-                QString( "<body \\1background: inherited;" ) );
+  // replace background
+  text.replace( QRegExp( "<\\s*body\\s*([^>]*)(background(|-color)):([^;\"]*(|;))" ),
+                QString( "<body \\1" ) );
+
+  // pattern of img and script
+  text.replace( QRegExp( "<\\s*(img|script)\\s*([^>]*)src=(\"|)(\\.\\.|)/" ),
+                QString( "<\\1 \\2src=\\3bres://%1/").arg( getId().c_str() ) );
 
-  text.replace( QRegExp( "<\\s*(img|script)\\s*([^>]*)src=\"/" ),
-                QString( "<\\1 \\2src=\"bres://%1/").arg( getId().c_str() ) );
+  // Fix links without '"'
+  text.replace( QRegExp( "href=(\\.\\.|)/([^\\s>]+)" ), QString( "href=\"\\1/\\2\"" ) );
 
-  text.replace( QRegExp( "<\\s*link\\s*([^>]*)href=\"/" ),
+  // pattern <link... href="..." ...>
+  text.replace( QRegExp( "<\\s*link\\s*([^>]*)href=\"(\\.\\.|)/" ),
                 QString( "<link \\1href=\"bres://%1/").arg( getId().c_str() ) );
 
-  text.replace( QRegExp( "<\\s*a\\s*([^>]*)href=\"/[^\"]*\"\\s*title=\"([^\"]*)\"" ),
-                QString( "<a href=\"gdlookup://localhost/\\2\" title=\"\\2\"") );
+  // localize the http://en.wiki***.com|org/wiki/<key> series links
+  // excluding those keywords that have ":" in it
+  QString urlWiki = "\"http(s|)://en\\.(wiki(pedia|books|news|quote|source|voyage|versity)|wiktionary)\\.(org|com)/wiki/([^:\"]*)\"";
+  text.replace( QRegExp( "<\\s*a\\s+(class=\"external\"\\s+|)href=" + urlWiki ),
+                QString( "<a href=\"gdlookup://localhost/\\6\"" ) );
+
+  // pattern <a href="..." ...>, excluding any known protocols such as http://, mailto:, #(comment)
+  // these links will be translated into local definitions
+  QRegExp rxLink( "<\\s*a\\s+([^>]*)href=\"(?!(\\w+://|#|mailto:|tel:))(/|)([^\"]*)\"\\s*(title=\"[^\"]*\")?[^>]*>",
+                       Qt::CaseSensitive,
+                       QRegExp::RegExp2 );
+  int pos = 0;
+  while( (pos = rxLink.indexIn( text, pos )) >= 0 )
+  {
+    QStringList list = rxLink.capturedTexts();
+    QString tag = list[3];     // a url, ex: Precambrian_Chaotian.html
+    if ( !list[4].isEmpty() )  // a title, ex: title="Precambrian/Chaotian"
+      tag = list[4].split("\"")[1];
+
+
+    // Check type of links inside articles
+    if( linksType == UNKNOWN && tag.indexOf( '/' ) >= 0 )
+    {
+      QString word = QUrl::fromPercentEncoding( tag.toLatin1() );
+      word.remove( QRegExp( "\\.(s|)htm(l|)$", Qt::CaseInsensitive ) ).
+           replace( "_", " " );
+
+      vector< WordArticleLink > links;
+      links = findArticles( gd::toWString( word ) );
+
+      if( !links.empty() )
+      {
+        linksType = SLASH;
+      }
+      else
+      {
+        word.remove( QRegExp(".*/") );
+        links = findArticles( gd::toWString( word ) );
+        if( !links.empty() )
+        {
+          linksType = NO_SLASH;
+          links.clear();
+        }
+      }
+    }
+
+    if( linksType == SLASH || linksType == UNKNOWN )
+    {
+      tag.remove( QRegExp( "\\.(s|)htm(l|)$", Qt::CaseInsensitive ) ).
+          replace( "_", "%20" ).
+          prepend( "<a href=\"gdlookup://localhost/" ).
+          append( "\" " + list[4] + ">" );
+    }
+    else
+    {
+      tag.remove( QRegExp(".*/") ).
+          remove( QRegExp( "\\.(s|)htm(l|)$", Qt::CaseInsensitive ) ).
+          replace( "_", "%20" ).
+          prepend( "<a href=\"gdlookup://localhost/" ).
+          append( "\" " + list[4] + ">" );
+    }
+
+    text.replace( pos, list[0].length(), tag );
+    pos += tag.length() + 1;
+  }
 
-  text.replace( QRegExp( "<\\s*a\\s*([^>]*)href=\"/A/([^\"]*)\"" ),
-                QString( "<a \\1href=\"gdlookup://localhost/\\2\"") );
+  // Occassionally words needs to be displayed in vertical, but <br/> were changed to <br\> somewhere
+  // proper style: <a href="gdlookup://localhost/Neoptera" ... >N<br/>e<br/>o<br/>p<br/>t<br/>e<br/>r<br/>a</a>
+  QRegExp rxBR( "(<a href=\"gdlookup://localhost/[^\"]*\"\\s*[^>]*>)\\s*((\\w\\s*&lt;br(\\\\|/|)&gt;\\s*)+\\w)\\s*</a>",
+                       Qt::CaseSensitive,
+                       QRegExp::RegExp2 );
+  pos = 0;
+  while( (pos = rxBR.indexIn( text, pos )) >= 0 )
+  {
+    QStringList list = rxBR.capturedTexts();
+    QString tag = list[2];
+    tag.replace( QRegExp( "&lt;br( |)(\\\\|/|)&gt;", Qt::CaseInsensitive ) , "<br/>" ).
+        prepend( list[1] ).
+        append( "</a>" );
+
+    text.replace( pos, list[0].length(), tag );
+    pos += tag.length() + 1;
+  }
+
+  // // output all links in the page - only for analysis
+  // QRegExp rxPrintAllLinks( "<\\s*a\\s+[^>]*href=\"[^\"]*\"[^>]*>",
+  //                         Qt::CaseSensitive,
+  //                         QRegExp::RegExp2 );
+  // pos = 0;
+  // while( (pos = rxPrintAllLinks.indexIn( text, pos )) >= 0 )
+  // {
+  //   QStringList list = rxPrintAllLinks.capturedTexts();
+  //   qDebug() << "\n--Alllinks--" << list[0];
+  //   pos += list[0].length() + 1;
+  // }
 
   // Fix outstanding elements
   text += "<br style=\"clear:both;\" />";
@@ -613,6 +751,192 @@
     return dictionaryDescription;
 }
 
+void ZimDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
+{
+  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+    FTS_index_completed.ref();
+
+  if( haveFTSIndex() )
+    return;
+
+  if( ensureInitDone().size() )
+    return;
+
+  if( firstIteration )
+    return;
+
+  gdDebug( "Zim: Building the full-text index for dictionary: %s\n",
+           getName().c_str() );
+
+  try
+  {
+    Mutex::Lock _( getFtsMutex() );
+
+    File::Class ftsIdx( ftsIndexName(), "wb" );
+
+    FtsHelpers::FtsIdxHeader ftsIdxHeader;
+    memset( &ftsIdxHeader, 0, sizeof( ftsIdxHeader ) );
+
+    // We write a dummy header first. At the end of the process the header
+    // will be rewritten with the right values.
+
+    ftsIdx.write( ftsIdxHeader );
+
+    ChunkedStorage::Writer chunks( ftsIdx );
+
+    BtreeIndexing::IndexedWords indexedWords;
+
+    QSet< uint32_t > setOfOffsets;
+
+    findArticleLinks( 0, &setOfOffsets, 0, &isCancelled );
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    QVector< uint32_t > offsets;
+    offsets.resize( setOfOffsets.size() );
+    uint32_t * ptr = &offsets.front();
+
+    for( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin();
+         it != setOfOffsets.constEnd(); ++it )
+    {
+      *ptr = *it;
+      ptr++;
+    }
+
+    // Free memory
+    setOfOffsets.clear();
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    qSort( offsets );
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    QMap< QString, QVector< uint32_t > > ftsWords;
+
+    set< quint32 > indexedArticles;
+    quint32 articleNumber;
+
+    // index articles for full-text search
+    for( int i = 0; i < offsets.size(); i++ )
+    {
+      if( isCancelled )
+        throw exUserAbort();
+
+      QString headword, articleStr;
+
+      articleNumber = getArticleText( offsets.at( i ), headword, articleStr,
+                                      &indexedArticles );
+      if( articleNumber == 0xFFFFFFFF )
+        continue;
+
+      indexedArticles.insert( articleNumber );
+
+      FtsHelpers::parseArticleForFts( offsets.at( i ), articleStr, ftsWords );
+    }
+
+    // Free memory
+    offsets.clear();
+
+    QMap< QString, QVector< uint32_t > >::iterator it = ftsWords.begin();
+    while( it != ftsWords.end() )
+    {
+      if( isCancelled )
+        throw exUserAbort();
+
+      uint32_t offset = chunks.startNewBlock();
+      uint32_t size = it.value().size();
+
+      chunks.addToBlock( &size, sizeof(uint32_t) );
+      chunks.addToBlock( it.value().data(), size * sizeof(uint32_t) );
+
+      indexedWords.addSingleWord( gd::toWString( it.key() ), offset );
+
+      it = ftsWords.erase( it );
+    }
+
+    // Free memory
+    ftsWords.clear();
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    ftsIdxHeader.chunksOffset = chunks.finish();
+    ftsIdxHeader.wordCount = indexedWords.size();
+
+    if( isCancelled )
+      throw exUserAbort();
+
+    BtreeIndexing::IndexInfo ftsIdxInfo = BtreeIndexing::buildIndex( indexedWords, ftsIdx );
+
+    // Free memory
+    indexedWords.clear();
+
+    ftsIdxHeader.indexBtreeMaxElements = ftsIdxInfo.btreeMaxElements;
+    ftsIdxHeader.indexRootOffset = ftsIdxInfo.rootOffset;
+
+    ftsIdxHeader.signature = FtsHelpers::FtsSignature;
+    ftsIdxHeader.formatVersion = FtsHelpers::CurrentFtsFormatVersion + getFtsIndexVersion();
+
+    ftsIdx.rewind();
+    ftsIdx.writeRecords( &ftsIdxHeader, sizeof(ftsIdxHeader), 1 );
+
+    FTS_index_completed.ref();
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Zim: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    QFile::remove( FsEncoding::decode( ftsIdxName.c_str() ) );
+  }
+}
+
+void ZimDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
+{
+  try
+  {
+    headword.clear();
+    string articleText;
+
+    loadArticle( articleAddress, articleText, 0, true );
+    text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Zim: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+}
+
+quint32 ZimDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text,
+                                    set< quint32 > * loadedArticles )
+{
+  quint32 articleNumber = 0xFFFFFFFF;
+  try
+  {
+    headword.clear();
+    string articleText;
+
+    articleNumber = loadArticle( articleAddress, articleText, loadedArticles, true );
+    text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
+  }
+  catch( std::exception &ex )
+  {
+    gdWarning( "Zim: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+  }
+  return articleNumber;
+}
+
+sptr< Dictionary::DataRequest > ZimDictionary::getSearchResults( QString const & searchString,
+                                                                 int searchMode, bool matchCase,
+                                                                 int distanceBetweenWords,
+                                                                 int maxResults )
+{
+  return new FtsHelpers::FTSResultsRequest( *this, searchString,searchMode, matchCase, distanceBetweenWords, maxResults );
+}
+
 /// ZimDictionary::getArticle()
 
 class ZimArticleRequest;
@@ -909,6 +1233,11 @@
 
       QImage img = QImage::fromData( reinterpret_cast< const uchar * >( resource.data() ), resource.size() );
 
+#ifdef MAKE_EXTRA_TIFF_HANDLER
+      if( img.isNull() )
+        GdTiff::tiffToQImage( &data.front(), data.size(), img );
+#endif
+
       dataMutex.unlock();
 
       if ( !img.isNull() )
@@ -938,8 +1267,8 @@
   }
   catch( std::exception &ex )
   {
-    qWarning( "ZIM: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
-              resourceName.c_str(), dict.getName().c_str(), ex.what() );
+    gdWarning( "ZIM: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
+               resourceName.c_str(), dict.getName().c_str(), ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -988,7 +1317,7 @@
         if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
              indexIsOldOrBad( indexFile ) )
         {
-          qDebug( "Zim: Building the index for dictionary: %s\n", i->c_str() );
+          gdDebug( "Zim: Building the index for dictionary: %s\n", i->c_str() );
 
           ZIM_header zh;
 
@@ -1159,21 +1488,22 @@
 
           idx.write( &idxHeader, sizeof( idxHeader ) );
         }
+
+        dictionaries.push_back( new ZimDictionary( dictId,
+                                                   indexFile,
+                                                   dictFiles ) );
       }
       catch( std::exception & e )
       {
-        qWarning( "Zim dictionary indexing failed: %s, error: %s\n",
-                  i->c_str(), e.what() );
+        gdWarning( "Zim dictionary initializing failed: %s, error: %s\n",
+                   i->c_str(), e.what() );
         continue;
       }
       catch( ... )
       {
-        qWarning( "Zim dictionary indexing failed\n" );
+        qWarning( "Zim dictionary initializing failed\n" );
         continue;
       }
-      dictionaries.push_back( new ZimDictionary( dictId,
-                                                 indexFile,
-                                                 dictFiles ) );
   }
   return dictionaries;
 }
diff -Nru goldendict-1.5.0~git20131003/zipfile.cc goldendict-1.5.0~git20150923/zipfile.cc
--- goldendict-1.5.0~git20131003/zipfile.cc	2013-08-16 09:45:56.000000000 +0000
+++ goldendict-1.5.0~git20150923/zipfile.cc	2015-09-23 08:26:24.000000000 +0000
@@ -151,6 +151,7 @@
   entry.compressedSize = qFromLittleEndian( record.compressedSize );
   entry.uncompressedSize = qFromLittleEndian( record.uncompressedSize );
   entry.compressionMethod = getCompressionMethod( record.compressionMethod );
+  entry.fileNameInUTF8 = ( qFromLittleEndian( record.gpBits ) & 0x800 ) != 0;
 
   return true;
 }
diff -Nru goldendict-1.5.0~git20131003/zipfile.hh goldendict-1.5.0~git20150923/zipfile.hh
--- goldendict-1.5.0~git20131003/zipfile.hh	2012-10-01 07:15:21.000000000 +0000
+++ goldendict-1.5.0~git20150923/zipfile.hh	2015-09-23 08:26:24.000000000 +0000
@@ -24,6 +24,7 @@
 
   quint32 localHeaderOffset, compressedSize, uncompressedSize;
   CompressionMethod compressionMethod;
+  bool fileNameInUTF8;
 };
 
 /// Represents contents of the local file header -- that what CentralDirEntry::
diff -Nru goldendict-1.5.0~git20131003/zipsounds.cc goldendict-1.5.0~git20150923/zipsounds.cc
--- goldendict-1.5.0~git20131003/zipsounds.cc	2013-10-02 20:42:04.000000000 +0000
+++ goldendict-1.5.0~git20150923/zipsounds.cc	2015-09-23 08:26:24.000000000 +0000
@@ -10,6 +10,9 @@
 #include "audiolink.hh"
 #include "indexedzip.hh"
 #include "filetype.hh"
+#include "gddebug.hh"
+#include "chunkedstorage.hh"
+#include "htmlescape.hh"
 
 #include <set>
 #include <string>
@@ -41,7 +44,7 @@
 enum
 {
   Signature = 0x5350495a, // ZIPS on little-endian, SPIZ on big-endian
-  CurrentFormatVersion = 1 + BtreeIndexing::FormatVersion
+  CurrentFormatVersion = 5 + BtreeIndexing::FormatVersion
 };
 
 struct IdxHeader
@@ -51,6 +54,7 @@
   uint32_t soundsCount; // Total number of sounds, for informative purposes only
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
+  uint32_t chunksOffset; // The offset to chunks' storage
 }
 #ifndef _MSC_VER
 __attribute__((packed))
@@ -85,6 +89,14 @@
     wstring::size_type pos = name.rfind( L'.' );
     if ( pos != wstring::npos )
       name.erase( pos );
+
+    // Strip spaces at the end of name
+    string::size_type n = name.length();
+    while( n && name.at( n - 1 ) == L' ' )
+      n--;
+
+    if( n != name.length() )
+      name.erase( n );
   }
   return name;
 }
@@ -94,6 +106,7 @@
   Mutex idxMutex;
   File::Class idx;
   IdxHeader idxHeader;
+  sptr< ChunkedStorage::Reader > chunks;
   IndexedZip zipsFile;
 
 public:
@@ -132,6 +145,8 @@
   idx( indexFile, "rb" ),
   idxHeader( idx.read< IdxHeader >() )
 {
+  chunks = new ChunkedStorage::Reader( idx, idxHeader.chunksOffset );
+
   // Initialize the index
 
   openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
@@ -174,7 +189,7 @@
     chain.insert( chain.end(), altChain.begin(), altChain.end() );
   }
 
-  multimap< wstring, string > mainArticles, alternateArticles;
+  multimap< wstring, uint32_t > mainArticles, alternateArticles;
 
   set< uint32_t > articlesIncluded; // Some synonims make it that the articles
                                     // appear several times. We combat this
@@ -195,12 +210,12 @@
     wstring headwordStripped =
       Folding::applySimpleCaseOnly( Utf8::decode( chain[ x ].word ) );
 
-    multimap< wstring, string > & mapToUse =
+    multimap< wstring, uint32_t > & mapToUse =
       ( wordCaseFolded == headwordStripped ) ?
         mainArticles : alternateArticles;
 
-    mapToUse.insert( std::pair< wstring, string >(
-      Folding::applySimpleCaseOnly( Utf8::decode( chain[ x ].word ) ), chain[ x ].word ) );
+    mapToUse.insert( std::pair< wstring, uint32_t >(
+      Folding::applySimpleCaseOnly( Utf8::decode( chain[ x ].word ) ), chain[ x ].articleOffset ) );
 
     articlesIncluded.insert( chain[ x ].articleOffset );
   }
@@ -210,42 +225,102 @@
 
   string result;
 
-  multimap< wstring, string >::const_iterator i;
+  multimap< wstring, uint32_t >::const_iterator i;
 
   result += "<table class=\"lsa_play\">";
+
+  vector< char > chunk;
+  char * nameBlock;
+
   for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
   {
+    try
+    {
+      Mutex::Lock _( idxMutex );
+      nameBlock = chunks->getBlock( i->second, chunk );
+
+      if ( nameBlock >= &chunk.front() + chunk.size() )
+      {
+        // chunks reader thinks it's okay since zero-sized records can exist,
+        // but we don't allow that.
+        throw ChunkedStorage::exAddressOutOfRange();
+      }
+    }
+    catch(  ChunkedStorage::exAddressOutOfRange & )
+    {
+      // Bad address
+      continue;
+    }
+
+    uint16_t sz;
+    memcpy( &sz, nameBlock, sizeof( uint16_t ) );
+    nameBlock += sizeof( uint16_t );
+
+    string name( nameBlock, sz );
+    nameBlock += sz;
+
+    string displayedName = mainArticles.size() + alternateArticles.size() > 1 ?
+           name : Utf8::encode( stripExtension( name ) );
+
     result += "<tr>";
 
     QUrl url;
     url.setScheme( "gdau" );
     url.setHost( QString::fromUtf8( getId().c_str() ) );
-    url.setPath( QString::fromUtf8( i->second.c_str() ) );
+    url.setPath( QString::fromUtf8( name.c_str() ) );
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
     result += addAudioLink( ref, getId() );
 
     result += "<td><a href=" + ref + "><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" alt=\"Play\"/></a></td>";
-    result += "<td><a href=" + ref + ">" + i->second + "</a></td>";
+    result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
     result += "</tr>";
   }
 
   for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
   {
+    try
+    {
+      Mutex::Lock _( idxMutex );
+      nameBlock = chunks->getBlock( i->second, chunk );
+
+      if ( nameBlock >= &chunk.front() + chunk.size() )
+      {
+        // chunks reader thinks it's okay since zero-sized records can exist,
+        // but we don't allow that.
+        throw ChunkedStorage::exAddressOutOfRange();
+      }
+    }
+    catch(  ChunkedStorage::exAddressOutOfRange & )
+    {
+      // Bad address
+      continue;
+    }
+
+    uint16_t sz;
+    memcpy( &sz, nameBlock, sizeof( uint16_t ) );
+    nameBlock += sizeof( uint16_t );
+
+    string name( nameBlock, sz );
+    nameBlock += sz;
+
+    string displayedName = mainArticles.size() + alternateArticles.size() > 1 ?
+           name : Utf8::encode( stripExtension( name ) );
+
     result += "<tr>";
 
     QUrl url;
     url.setScheme( "gdau" );
     url.setHost( QString::fromUtf8( getId().c_str() ) );
-    url.setPath( QString::fromUtf8( i->second.c_str() ) );
+    url.setPath( QString::fromUtf8( name.c_str() ) );
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
     result += addAudioLink( ref, getId() );
 
     result += "<td><a href=" + ref + "><img src=\"qrcx://localhost/icons/playsound.png\" border=\"0\" alt=\"Play\"/></a></td>";
-    result += "<td><a href=" + ref + ">" + i->second + "</a></td>";
+    result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
     result += "</tr>";
   }
 
@@ -273,10 +348,31 @@
   if ( chain.empty() )
     return new Dictionary::DataRequestInstant( false ); // No such resource
 
+  // Find sound
+
+  uint32_t dataOffset = 0;
+  for( int x = chain.size() - 1; x >= 0 ; x-- )
+  {
+    vector< char > chunk;
+    char * nameBlock = chunks->getBlock( chain[ x ].articleOffset, chunk );
+
+    uint16_t sz;
+    memcpy( &sz, nameBlock, sizeof( uint16_t ) );
+    nameBlock += sizeof( uint16_t );
+
+    string fileName( nameBlock, sz );
+    nameBlock += sz;
+
+    memcpy( &dataOffset, nameBlock, sizeof( uint32_t ) );
+
+    if( name.compare( fileName ) == 0 )
+      break;
+  }
+
   sptr< Dictionary::DataRequestInstant > dr = new
     Dictionary::DataRequestInstant( true );
 
-  if ( zipsFile.loadFile( chain[ 0 ].articleOffset, dr->getData() ) )
+  if ( zipsFile.loadFile( dataOffset, dr->getData() ) )
     return dr;
 
   return new Dictionary::DataRequestInstant( false );
@@ -329,7 +425,7 @@
       if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
            indexIsOldOrBad( indexFile ) )
       {
-        qDebug( "Zips: Building the index for dictionary: %s\n", i->c_str() );
+        gdDebug( "Zips: Building the index for dictionary: %s\n", i->c_str() );
 
         File::Class idx( indexFile, "wb" );
         IdxHeader idxHeader;
@@ -342,26 +438,41 @@
         idx.write( idxHeader );
 
         IndexedWords names, zipFileNames;
+        ChunkedStorage::Writer chunks( idx );
+        quint32 namesCount;
+
         IndexedZip zipFile;
         if( zipFile.openZipFile( QDir::fromNativeSeparators(
                                  FsEncoding::decode( i->c_str() ) ) ) )
-          zipFile.indexFile( zipFileNames );
+          zipFile.indexFile( zipFileNames, &namesCount );
 
         if( !zipFileNames.empty() )
         {
-          // Remove extension for sound files (like in sound dirs)
-
           for( IndexedWords::iterator i = zipFileNames.begin(); i != zipFileNames.end(); ++i )
           {
             vector< WordArticleLink > links = i->second;
             for( unsigned x = 0; x < links.size(); x++ )
             {
+              // Save original name
+
+              uint32_t offset = chunks.startNewBlock();
+              uint16_t sz = links[ x ].word.size();
+              chunks.addToBlock( &sz, sizeof(uint16_t) );
+              chunks.addToBlock( links[ x ].word.c_str(), sz );
+              chunks.addToBlock( &links[ x ].articleOffset, sizeof( uint32_t ) );
+
+              // Remove extension for sound files (like in sound dirs)
+
               wstring word = stripExtension( links[ x ].word );
               if( !word.empty() )
-                names.addSingleWord( word, links[ x ].articleOffset );
+                names.addSingleWord( word, offset );
             }
           }
 
+          // Finish with the chunks
+
+          idxHeader.chunksOffset = chunks.finish();
+
           // Build the resulting zip file index
 
           IndexInfo idxInfo = BtreeIndexing::buildIndex( names, idx );
@@ -374,7 +485,7 @@
           idxHeader.signature = Signature;
           idxHeader.formatVersion = CurrentFormatVersion;
 
-          idxHeader.soundsCount = names.size();
+          idxHeader.soundsCount = namesCount;
 
           idx.rewind();
 
@@ -395,8 +506,8 @@
     }
     catch( std::exception & e )
     {
-      qWarning( "Zipped sounds pack reading failed: %s, error: %s\n",
-                i->c_str(), e.what() );
+      gdWarning( "Zipped sounds pack reading failed: %s, error: %s\n",
+                 i->c_str(), e.what() );
     }
   }